Added options for juime controls and updated test cases
Merge branch 'master' of https://github.com/Imaginea/JUIME