cleanup
Merge branch 'feature/v2' of https://github.com/flexmotion/relax.boilerplate into feature/v2

Conflicts:
	tasks/tasks.coffee