Debug
Merge branch 'production' of github.com:zavsnar/web-bioapp into production

Conflicts:
	apps/objects/views.py