Configured for production
Merge branch 'master' into production

Conflicts:
	www/global_var.js
	www/index.html
Cleaned Up Merge.
Merge branch 'production'