Merge branch 'hotfix/merge-problem'
Merge branch 'master' of github.com:errai/errai
added source of jaxrs annotations because we now have a compile dependency
Merge branch 'hotfix/ERRAI-566'
fix errai-ui, comment out repos