Updated project to latest AndroidStudio + AndroidAnnotation