#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.
Don't log 'Resolve log file' if log level is higher
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
Merge remote-tracking branch 'origin/develop' into 264_sharedpref_string_set
add: thread control by @SupposeBackground and @SupposeUiThread annotations
Upgrade to RoboGuice 2

This commit adds RoboGuice 2 support, RoboGuice 1 support is dropped.
Update to Robolectric 2.2

Initial implementation for upgrading to Robolectric 2.2.
SaveInstanceStateActivityParameterizedTest is failing, which is due to
a Robolectric bug described in #973.
This commit dependes on RoboGuice 2 which is implemented in #983.

All other tests should be OK. This involves lots of code change and
simplification thanks to Robolectric 2.2.
fix: SupposeUiThread and SupposeBackground worked wrong if generated method was modified because of another annotation
Merge pull request #993 from yDelouis/fix_logLevel

Don't log 'Resolve log file' if log level is higher