commit 12.11.2013
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/UsersController.php