Merge branch 'master' into raymond/postgress

Conflicts:
	Frankenstein_admin/admin_page/models/actor.js
	Frankenstein_admin/admin_page/models/crew.js
	Frankenstein_admin/admin_page/models/event.js
	Frankenstein_admin/admin_page/models/performance.js
	Frankenstein_admin/admin_page/models/production.js
	Frankenstein_admin/admin_page/models/stage.js
	Frankenstein_admin/admin_page/routes/home.js