Inclusion of OTP after registration
Preparing for the next iteration
Inclusion of resource files for CDI support
Inclusion of resource files
Merge branch 'picketlink_integration'
Revert "Merge branch 'picketlink_integration'"

This reverts commit b2a031e94e3863f67f894d42ad76d136400d16a9, reversing
changes made to 042041ed12ce76c3d843459ff1c66be987db6fd4.
Switch to stable releases until fix some issues on aerogear-security-picketlink
AEROGEAR-905 "Update Controller Demo README"
Updated after feedback on PR.
Chaning java -> Java.
Merge branch 'AEROGEAR-905-update-readme'