Felix's edits
Merge branch 'master' of https://github.com/fephsun/orgo

Conflicts:
	views.py
Merge branch 'master' of https://github.com/fephsun/orgo

Conflicts:
	views.py
Merged.