Merge branch 'develop'

Conflicts:
	README.md
	android_preferences_manager/README.md
	android_preferences_manager/documentation/doc/allclasses-frame.html
	android_preferences_manager/documentation/doc/allclasses-noframe.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/PreferencesManager.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.BooleanPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.ChangeCallback.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.EnumPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.FloatPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.IntegerPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.LongPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.StringPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.StringSetPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/SharedPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/PreferencesManager.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.BooleanPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.ChangeCallback.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.EnumPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.FloatPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.IntegerPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.LongPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.StringPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.StringSetPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/class-use/SharedPreference.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/package-frame.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/package-summary.html
	android_preferences_manager/documentation/doc/com/wit/and/preferences/package-use.html
	android_preferences_manager/documentation/doc/constant-values.html
	android_preferences_manager/documentation/doc/deprecated-list.html
	android_preferences_manager/documentation/doc/help-doc.html
	android_preferences_manager/documentation/doc/index-files/index-1.html
	android_preferences_manager/documentation/doc/index-files/index-2.html
	android_preferences_manager/documentation/doc/index-files/index-3.html
	android_preferences_manager/documentation/doc/index-files/index-4.html
	android_preferences_manager/documentation/doc/index-files/index-5.html
	android_preferences_manager/documentation/doc/index-files/index-6.html
	android_preferences_manager/documentation/doc/index.html
	android_preferences_manager/documentation/doc/overview-tree.html
	android_preferences_manager/lib/android-preferences-manager.jar