more small fixes
:/
Merge remote-tracking branch 'origin/master'

Conflicts:
	travel_buddy/src/main/webapp/travel/app/js/controllers.js
resolve

Conflicts:

	travel_buddy/src/main/java/travelbuddy/webservice/ApplicationConfig.java
	travel_buddy/src/main/webapp/travel/app/js/controllers.js