Merge branch 'master' into android-2.1

Conflicts:
	makados_org/wordtutor-android/AndroidManifest.xml
Merge branch 'master' into android-2.1

Conflicts:
	makados_org/wordtutor-android/AndroidManifest.xml