Merge branch 'master' of github.com:mr0re1/corp

Conflicts:
	views/search.jade