ch
Merge commit 'b84fc91ac2ec39b701ac832b9830938427a61051'

Conflicts:
	thesis/src/main/java/com/fh/his/thesis/App.java