mesg
com
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	data.json
	scripts/app.js
	scripts/controllers/calendar-controller.js
	scripts/controllers/details-controller.js
	scripts/services/helper.js