Revert "Revert "Merge branch 'master' of https://github.com/SweenEy1130/GeenZen""

Conflicts:
	ChunTsung/conf/application.conf