Mor entities
Merge branch 'master' of https://github.com/ruhley/mapster-cms

Conflicts:
	app/index.html
	app/scripts/components/fields.js
	app/scripts/models/places.js
	app/scripts/routes/entity-info.js
	app/scripts/templates.js
	app/templates/components/media-field.hbs
	app/templates/components/universe-field.hbs
	app/templates/entity/info.hbs
	bower.json