Fix Android directory name to match Android SDK Manager R20
Updated build.xml
Merge branch 'master' of https://github.com/pivotal/AndroidIntelliJStarter

Conflicts:
	.idea/libraries/Android_2_1_Google_API_libs.xml
	.idea/libraries/Android_2_2_Google_API_libs.xml
	README.md
	build.xml