Merge branch 'master' into raymond/postgress

Conflicts:
	Frankenstein_admin/admin_page/models/performance.js
	Frankenstein_admin/admin_page/models/production.js
	Frankenstein_admin/admin_page/public/js/updatePerfScript.js
	Frankenstein_admin/admin_page/public/stylesheets/style.css
	Frankenstein_admin/admin_page/routes/home.js
	Frankenstein_admin/admin_page/views/layout.jade
	Frankenstein_admin/admin_page/views/updatePerf.jade