awesome things
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/views/Widget.js
Merge branch 'master' of https://github.com/Agent-H/londonhackathon
Merge branch 'master' of https://github.com/Agent-H/londonhackathon