Check in latest ang-main
Check in refactoring of the jsp pages