Merge origin/master

Conflicts:
	app/config/app.php
	app/models/User.php
	app/routes.php
	app/views/users/index.blade.php
	nbproject/project.properties
	nbproject/project.xml