Android projects updates
Merge branch 'master' of github.com:vogella/vogella

Conflicts:
	HelloWorld/.classpath
	HelloWorld/.project
	HelloWorld/proguard-project.txt
	HelloWorld/project.properties
	aaa_test/.classpath
	aaa_test/.project
	aaa_test/AndroidManifest.xml
	aaa_test/ic_launcher-web.png
	aaa_test/libs/android-support-v4.jar
	aaa_test/proguard-project.txt
	aaa_test/project.properties
	aaa_test/res/drawable-hdpi/ic_launcher.png
	aaa_test/res/drawable-mdpi/ic_launcher.png
	aaa_test/res/drawable-xhdpi/ic_launcher.png
	aaa_test/res/drawable-xxhdpi/ic_launcher.png
	aaa_test/res/layout/activity_main.xml
	aaa_test/res/menu/main.xml
	aaa_test/res/values-sw600dp/dimens.xml
	aaa_test/res/values-sw720dp-land/dimens.xml
	aaa_test/res/values-v11/styles.xml
	aaa_test/res/values-v14/styles.xml
	aaa_test/res/values/dimens.xml
	aaa_test/res/values/strings.xml
	aaa_test/res/values/styles.xml
	com.vogella.android.actionbar.actionview.search/.classpath
	com.vogella.android.actionbar.actionview.search/libs/android-support-v4.jar
	com.vogella.android.actionbar.actionview.search/proguard-project.txt
	com.vogella.android.actionbar.actionview.search/res/layout/activity_main.xml
	com.vogella.android.actionbar.actionview.search/res/values-sw600dp/dimens.xml
	com.vogella.android.actionbar.actionview.search/res/values-sw720dp-land/dimens.xml
	com.vogella.android.actionbar.actionview.search/res/values-v11/styles.xml
	com.vogella.android.actionbar.actionview.search/res/values-v14/styles.xml
	com.vogella.android.actionbar.actionview.search/res/values/dimens.xml
	com.vogella.android.actionbar.actionview.search/res/values/styles.xml
	com.vogella.android.actionbarsherlock.usage/ic_launcher-web.png
	com.vogella.android.actionbarsherlock.usage/res/drawable-hdpi/ic_launcher.png
	com.vogella.android.actionbarsherlock.usage/res/drawable-mdpi/ic_launcher.png
	com.vogella.android.actionbarsherlock.usage/res/drawable-xhdpi/ic_launcher.png
	com.vogella.android.actionbarsherlock.usage/res/drawable-xxhdpi/ic_launcher.png
	com.vogella.android.actionbarsherlock.usage/res/menu/main.xml
	com.vogella.android.build.firstant/ic_launcher-web.png
	com.vogella.android.build.firstant/libs/android-support-v4.jar
	com.vogella.android.build.firstant/res/drawable-hdpi/ic_launcher.png
	com.vogella.android.build.firstant/res/drawable-mdpi/ic_launcher.png
	com.vogella.android.build.firstant/res/drawable-xhdpi/ic_launcher.png
	com.vogella.android.build.firstant/res/drawable-xxhdpi/ic_launcher.png
	com.vogella.android.build.firstant/res/layout/activity_main.xml
	com.vogella.android.build.firstant/res/menu/main.xml
	com.vogella.android.build.firstant/res/values-sw600dp/dimens.xml
	com.vogella.android.build.firstant/res/values-sw720dp-land/dimens.xml
	com.vogella.android.build.firstant/res/values-v11/styles.xml
	com.vogella.android.build.firstant/res/values-v14/styles.xml
	com.vogella.android.build.firstant/res/values/dimens.xml
	com.vogella.android.build.firstant/res/values/styles.xml
	com.vogella.android.build.firstgradle/res/values/strings.xml
	com.vogella.android.pulltorefresh/.project
	com.vogella.android.pulltorefresh/AndroidManifest.xml
	com.vogella.android.pulltorefresh/res/values/strings.xml
	com.vogella.android.test.simpleactivity/AndroidManifest.xml
	de.vogella.android.intentservice.download_draft/project.properties
New Mockito test