admin
merge
Merge origin/master

Conflicts:
	sandbox/app/model/UserRepository.php
	sandbox/www/css/style.css