test x-editable
try select2
Merge branch 'master' of github.com:ycswaves/meteor_login_demo

Conflicts:
	client/main.html
	client/main.js