Tests all currently run and pass
Merge branch 'master' of https://github.com/minhtrangvy/AirPool

Conflicts:
	app/src/androidTest/java/com/airpool/Activities/HomepageActivityFunctionalTest.java
	app/src/androidTest/java/com/airpool/Activities/HomepageActivityUnitTest.java
	app/src/androidTest/java/com/airpool/SearchActivityRobotiumTest.java