Updated all functionalities
Merge branch 'master' of https://github.com/zifeishan/emotif

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