no message
Merge branch 'master' of https://github.com/StefanPanait/temp_name

Conflicts:
	css/gui.css
	js/Core.js