#264 - using Apache ObjectSerializer.
Merge remote-tracking branch 'upstream/develop' into 264_sharedpref_string_set

Conflicts:
	AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java
Merge & move things in the right place again.
Ensure the stringset files will generated as well.
Ensure to use canonical name constants
Merge branch 'develop' of https://github.com/excilys/androidannotations into 264_sharedpref_string_set

Conflicts:
	AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomePrefs.java
Merge https://github.com/excilys/androidannotations into 264_sharedpref_string_set

Conflicts:
	AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java
Update to latest AA code changes.
Add @EditorAction
Add tests for @EditorAction
Inject EBean in rest interceptors
Added keyRes parameter to @DefaultXXX annotations
Changed test
Fix typos in user visible output
Inject EBean in rest converters
Remove restErrorHandler field in rest service if not necessary
Surround with try catch in all cases
Update EditorAction's doc
Merge changes from develop in 494_EditorAction
Fix converters and interceptors validation