#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.
Enable enhanced inner classes
Add validation for inner classes
Fix injection of Beans
Add license
Fix inner SharedPref
Merge changes from develop in 248_enhanceInnerClass
Fix injection of Bean with incremental compilation
merge branch '264_sharedpref_string_set' of https://github.com/ened/androidannotations.git
updated to work with latest AA
Using XML serialization
updated tests
removed accidentally commited old commented code