Added keyRes parameter to @DefaultXXX annotations
Changed test
Surround with try catch in all cases
Update Android plugin, gradle, and android sdk and build tools versions.
Update Android plugin, gradle, and android sdk and build tools versions.
Merge branch '826_stringResPrefKeys' of https://github.com/WonderCsabo/androidannotations into WonderCsabo-826_stringResPrefKeys
Move litObject method to APTCodeModelHelper
Merge branch 'WonderCsabo-826_stringResPrefKeys' into develop
Merge pull request #949 from vwmattr/version-updates

Update Android plugin, gradle, and android sdk and build tools versions.
Merge branch '914_setscookies_errorhandler' of https://github.com/yDelouis/androidannotations into yDelouis-914_setscookies_errorhandler

Conflicts:
	AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
	AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java
Merge branch 'yDelouis-914_setscookies_errorhandler' into develop
Enable to inject a RequestFactory in a RestTemplate
Merge pull request #832 from yDelouis/651_requestFactory

Enable to inject a RequestFactory in a RestTemplate