Android
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrippieApp/src/com/activities/LoginActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrippieApp/TrippieApp.iml
	TrippieApp/project.properties