zentask user
Merge branch 'master' of https://github.com/matth3o/vinodrop

Conflicts:
	app/controllers/Secured.java
	app/models/Project.java
	conf/routes