Merge Authentication Branch into jrcportal