-
-
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
	tasks/favicon.js
-