Commit
Merge origin/master

Conflicts:
	conf/myConf.properties