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'
Merge tag 'androidannotations-3.0'

[maven-release-plugin]  copy for tag androidannotations-3.0

Conflicts:
	AndroidAnnotations/androidannotations-api/pom.xml
	AndroidAnnotations/androidannotations-bundle/pom.xml
	AndroidAnnotations/androidannotations-with-codemodel/pom.xml
	AndroidAnnotations/androidannotations/pom.xml
	AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeanHolder.java
	AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EFragmentProcessor.java
	AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OnActivityResultProcessor.java
	AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OnActivityResultValidator.java
	AndroidAnnotations/functional-test-1-5-tests/pom.xml
	AndroidAnnotations/functional-test-1-5/pom.xml
	AndroidAnnotations/pom.xml
Merge tag 'androidannotations-3.0.1'

[maven-release-plugin]  copy for tag androidannotations-3.0.1
Merge tag 'androidannotations-3.1'

[maven-release-plugin]  copy for tag androidannotations-3.1
Merge branch 'master' of https://github.com/excilys/androidannotations into fix_master