sliding up view
project.properties
Merge branch 'master' of https://github.com/pascalalfadian/smartpublictransport

Conflicts:
	project.properties
fix option menu
fix color
Merge branch 'master' of https://github.com/pascalalfadian/smartpublictransport

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml