Assemble refactor
editorconfig
Prod files
Merge branch 'assemble'

* assemble:
  Prod files
  editorconfig
  Assemble refactor

Conflicts:
	Gruntfile.js
	app/scripts/main.js