Grunt workflow integration
Merge branch 'master' into dev
GitIgnore update
Fixed startup errors
Merge branch 'dev'

Conflicts:
	functions.php