Changes...
Merge branch 'master' of https://github.com/losogudok/Calendar

Conflicts:
	public/js/app/widgets/calendar/models/eventModel.js
	public/js/app/widgets/calendar/storage/calendarDB.js