pull master into develop

this PR should correct the fact that the master branch is 19 commits ahead of the develop branch as discussed [here](https://github.com/excilys/androidannotations/issues/1065#issuecomment-54781511)

as part of this chang, this PR updates the [AwaitingResultFragment.java](https://github.com/excilys/androidannotations/blob/develop/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultFragment.java) to a state that is present on master but not on develop. (btw the actual test class for this is missing.)



PS: sorry for missing issue number on branch name. :(