Merge commit 'androidannotations-2.4'
Merge commit 'androidannotations-2.5'
Merge commit 'androidannotations-2.5.1'
Merge commit 'androidannotations-2.6'
Merge branch 'master' of github.com:excilys/androidannotations
Call afterSetContentView in onViewCreated
Use proper return type for Fragment.onViewCreated(...)
Added a break statement at the end of each case statement into source code generated using @OnActivityResult

Conflicts:
	AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OnActivityResultProcessor.java
Updated artifacts version n order to prepare 2.7.1 release
[maven-release-plugin] prepare release androidannotations-2.7.1
[maven-release-plugin] prepare for next development iteration
Merge branch 'hotfix/2.7'
Fixed : @OnActivityResult was not available in Fragment subclasses
[maven-release-plugin] prepare release androidannotations-2.7.1
[maven-release-plugin] prepare for next development iteration
Merge branch 'hotfix/2.7'
#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.