Merge branch '3.0' of http://www.iramuteq.org/git/iramuteq into 3.0

diff --cc PrintRScript.py
Simple merge

diff --cc corpus.py
Simple merge

diff --cc functions.py
Simple merge

diff --cc iramuteq.py
Simple merge

diff --cc layout.py
Simple merge