Revert to stable version

ng-scope problems
Merge branch 'master' of https://github.com/justinyangusa/angelhack

Conflicts:
	framework/app.js