update
Merge branch 'master' of https://github.com/johniak/Task

Conflicts:
	app/models/Task.java
	conf/routes