conventioning patch 2

fixing directory locations
Merge branch 'master' of https://github.com/robolivable/livechat

Conflicts:
	assets/js/module.js