Merge origin/master
navigation
Merge origin/master
Merge branch 'master' of https://github.com/khaled87/Travel_Buddy

Conflicts:
	travel_buddy/src/main/java/travelbuddy/proxy/QPXProxy.java
Resolve conflicts