User role (admin) + images
Merge branch 'master' of https://github.com/marcu/acadewy

Conflicts:
	public/assets/css/style.css