Merging models
Merge branch 'Refactoring' of https://github.com/open-learning-exchange/BeLL-Apps into Refactoring

Conflicts:
	attachments/MyApp/index.html