Added new changes by Chaminda
Merge branch 'master' of https://github.com/handakumbura/WSO2_QAP_Application

Merged ..