Login
Merge branch 'master' into production

Conflicts:
	apps/bioface/utils.py
sort by.
Hide ordering
Now objects can be sorted
Add list of all attributes
Debug
Debug
Merge branch 'production' of github.com:zavsnar/web-bioapp into production

Conflicts:
	apps/objects/views.py
Attributes sort