Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/richiejk/voyagetales/DashBoardActivity.java
	app/src/main/java/com/richiejk/voyagetales/TripActivity.java
	app/src/main/java/com/richiejk/voyagetales/common/Finals.java
	app/src/main/java/com/richiejk/voyagetales/models/TripModel.java
	app/src/main/res/values/strings.xml