started dashboard page; modified filters
Merge branch 'master' of github.com:phoenix-scitent/okm

Conflicts:
	app/views/keys/search.html.erb