Moves shell and screen into their respective bundles
Removes build time from the manifest
Merge branch 'master' into gh-pages

Conflicts:
	Swat.min.js
	manifest.js