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
Update Guava to 15.0

We want to integrate Parceler, but we ran into a problem. The Guava
version used by Parceler is 15.0, but our pom is declaring the 13.0.1
version. Because of this when using Parceler in conjunction with AA,
the older Guava dependency is resolved, witch results in problems,
since Parceler needs the new classes introduced since 13.0.1.

This commit addresses this issue by simply updating the Guava version to
15.0. This is enough because our code do not uses any classes which are
changed since 13.0.1.
Merge pull request #981 from WonderCsabo/977_updateGuava

Update Guava to 15.0