Grunt  - cache busting.
Merge branch 'cachebust' into dev

* cachebust:
  Grunt  - cache busting.

Conflicts:
	Gruntfile.js
	package.json
phantomjs support
Merge branch 'phantomjs' into dev

* phantomjs:
  phantomjs support

Conflicts:
	package.json
Make compile run build.