comm
Merge remote-tracking branch 'origin/master'

Conflicts:
	ntalk/controllers/home.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	ntalk/controllers/home.js