stuff
Merge branch 'master' into develop

* master:
  stuff

Conflicts:
	assets/css/Stylesheet.css