added results controller
merge fixes
Merge branch 'change' into develop

Conflicts:
	app/js/app.js