Refactoring
Merge branch 'master' of https://github.com/jmfolds/sandbox

Conflicts:
	acc-sandbox/Scripts/app/AppView.js