Merge pull request #8 from phuonghuynh/master

Please review my changes
Merge pull request #12 from phuonghuynh/master

I will merge it but I need to fix the bower and new code.
Revert "Update changes"
Merge pull request #13 from chrisshayan/revert-12-master

Revert "Update changes"
Merge pull request #21 from phuonghuynh/master

Fix for /techlooper not work
Avoiding Tests to be executed on Travis. Travis has no access to our ElasticSearch servers.
Merge remote-tracking branch 'origin/Release4' into Release4
Avoiding Tests to be executed on Travis. Travis has no access to our ElasticSearch servers.
Merge remote-tracking branch 'origin/Release4'

Conflicts:
	pom.xml
	src/main/java/com/techlooper/config/TechLooperConfiguration.java
	src/main/java/com/techlooper/config/WebConfig.java
	src/main/java/com/techlooper/controller/VietnamworksJobStatisticController.java
	src/main/resources/techlooper.properties
	src/test/java/com/techlooper/controller/VietnamworksJobStatisticControllerTest.java
Merge branch 'master' into Release4
Merge pull request #24 from chrisshayan/Release4

Merge branch 'master' into Release4
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
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'