Merge branch 'hotfix/0.1.22'

* hotfix/0.1.22:
  bump version to 0.1.22
make rsync excludes more specific
Merge branch 'hotfix/0.1.23' into develop

* hotfix/0.1.23:
  make rsync excludes more specific

Conflicts:
	app/templates/_Gruntfile.coffee