Updated deploy script
Removed placeholder.js
Build commit
Deploy Commit
Merge branch '1384864329'

* 1384864329:
  Deploy Commit
  Build commit
  Removed placeholder.js
  Updated deploy script

Conflicts:
	dist/js/b757accd.main.js
	js/0ca4ad89.main.js
	js/b757accd.main.js