Changes made by Jason McIntosh (jason.mcintosh@telerik.com).
Merge branch 'master' of https://github.com/shoerob/MuseumApp.git

Conflicts:
	MuseumApp/scripts/app/main.js