Update pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	hackathon14/twid/views.py
	hackathon14/urls.py
Update pages