Moved frontend jades
Merge branch 'master' of github.com:zifeishan/emotif

Conflicts:
	emotif/package.json