Merge branch 'hotfix/v0.2.3'
Add post config extending block to gruntfile
Bump version
Merge branch 'hotfix/v0.2.4' into develop

Conflicts:
	Gruntfile.coffee