Visual changes
Merge branch 'master' of github.com:Jimimick/ProjectEmerc

Conflicts:
	Emerc/Emerc.pro.user