Merge branch 'master' of https://github.com/phuonghuynh/TechLooper into phuonghuynh-master

Conflicts:
	pom.xml
	src/main/resources/static/sockjs-0.3.4.js
	src/main/resources/static/stomp.js