More on text box
Merge branch 'master' of https://github.com/abilashs90/wav

Conflicts:
	app/client/pages/home/home.js