angular
Merge branch 'thomas'

Conflicts:
	app/controllers/Application.java
	conf/routes