Merge origin/first into first

Conflicts:
	app/controller/AppController.js
Merge origin/first into first

Conflicts:
	app/controller/AppController.js