weather works, twitter works may be, filter stops works
Merge branch 'master' into ThisWorks_dont_fuck_it_up

Conflicts:
	APP/framework/controller.js
Fix