move models to entities
Merge branch 'master' of github.com:jbpin/express-marionette-boilerplate

Conflicts:
	public/app/modules/contacts/controllers/contact.js
	public/app/modules/contacts/controllers/index.js
	public/app/modules/contacts/index.js
	public/js/built.js