Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript...

... file r=gduan

Conflicts:
	Makefile