admin update
Merge branch 'frontend' of https://github.com/wietsedevries/TNW into frontend

Conflicts:
	app/assets/stylesheets/application.css