ajaxed in chat room
Merge branch 'master' into front_end
Merge branch 'front_end'

Conflicts:
	pages/index.html
	pages/js/main.js