Jetty config for /techlooper
Merge pull request #11 from phuonghuynh/master

Enable /techlooper in jetty
Update css for RWD
Commit to conclude merge
Return terms
Merged with phuonghuynh
Merge branch 'phuong-master'
Remove stop port of jetty
Remove stop port of jetty
Merge branch 'master' of https://github.com/phuonghuynh/TechLooper into phuonghuynh-master

Conflicts:
	pom.xml
Merge branch 'phuonghuynh-master'
Merge pull request #11 from chrisshayan/Release5

Release5
Required to commit when merge Release 5 from Chris
Merge branch 'master' of https://github.com/phuonghuynh/TechLooper
Return all terms
Revert to prior version of main.js
Return Term Name to client
write function to get data from Java
Merge branch 'master' of https://github.com/phuonghuynh/TechLooper into phuonghuynh-master

Conflicts:
	src/main/java/com/techlooper/config/CoreConfiguration.java
	src/main/webapp/assets/js/main.js
Merge branch 'phuonghuynh-master'