Updated new logo
XML CleanUp
code again cleanup
Adjust padding and fonts attributes
Code Updated
Modified
Added EXIT function
Cleanup
logo.png included
Logo.png Included
Merge branch 'px' into next
v1.1.3
Merge branch 'cmx' into master

Conflicts:
	AndroidManifest.xml
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-ldpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/layout/fare_calc.xml
	res/layout/main.xml
removed max SDK version

whitespace change
removed duplicate directory
dos2unix res/layout*/*
whitespace
changed project.properties target to android-18
changed eclipse prefs tab char from space to tab
Merge pull request #3 from sweetiepiggy/next

Next