Merge branch 'action'

Conflicts:
	src/com/example/taximap/SplashScreen.java
Merge branch 'master' of https://github.com/vfonte91/TaxiMap