Moved auto-load event into directive.
Merge branch 'master' of https://github.com/WPFerg/scratch-app

Conflicts:
	app/js/controllers.js