splash timeout increased
layout modified
support library added
Merge branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	GeoTest.iml
ignore updated
ignore modified
problem with map showing resolved
Merge branch 'origin/master'

Conflicts:
	.gitignore
	AndroidManifest.xml
	GeoTest.iml
	res/layout/main.xml
	src/com/example/GeoTest/InputMap.java
	src/com/example/GeoTest/SplashScreen.java
Merge branch 'origin/master'