Sync
Sync
Sync
Merge branch 'master' of https://github.com/fischerdom/tasking

Conflicts:
	log/development.log