--self tens syncing
Merge branch 'Refactoring' of https://github.com/open-learning-exchange/BeLL-Apps into Refactoring

Conflicts:
	attachments/MyApp/app/Router.js
	attachments/MyApp/app/collections/shelfResource.js