BYE BYE YAPSY.

Cannot sort out the search path...
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views.py