Merge branch 'develop' into 264_sharedpref_string_set

Conflicts:
	AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/prefs/PrefsActivityTest.java