Confirmation
Merge
Solve conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	travel_buddy/src/main/java/travelbuddy/dao/IOrderBook.java
	travel_buddy/src/main/webapp/travel/app/js/controllers.js
Solve again