Fix incorrect rock_type filter
Basic login/logout implementation
Merge branch 'master' of https://github.com/kristallizer/metpetdb_interface

Conflicts:
	templates/base.html
tabbed search interface