Fixed select navbar
Merge branch 'master' of github.com:zifeishan/emotif

Conflicts:
	emotif/app/views/partials/select.jade