Added fragment class
Commented out navigation intent start
Merge branch 'action'

Conflicts:
	src/com/example/taximap/SplashScreen.java