Some changes
Merge branch 'master' of https://github.com/Belon-/SMDE-Belon

Conflicts:
	public/sass/app.scss
	public/stylesheets/app.css
	public/stylesheets/app.css.map