use gulp-angular-templatecache to bundle templates
Merge branch 'master' into angular

Conflicts:
	gulpfile.coffee
	package.json
remove node-static from package
update gulp-minify-css version
add .DS_Store files to gitignore
Merge branch 'master' into angular

Conflicts:
	.gitignore
	package.json
Merge branch 'angular' into MEAN

Conflicts:
	README.md
	gulpfile.coffee
Merge branch 'MEAN' of github.com:leonidas/gulp-project-template into MEAN

Conflicts:
	README.md
	gulpfile.coffee
	package.json