add discover state
Merge branch 'master' of https://github.com/ostb/ostb

Conflicts:
	public/controllers/controllers.js
	public/partials/discover.html