Merge

Conflicts:
	Gruntfile.coffee
Resolve