Fixes
Merge branch 'master' of https://github.com/antonpug/Simple

Conflicts:
	assets/css/main.min.css
	assets/less/app.less
	lib/scripts.php