additional on frontend
Frontend updates
Merge branch 'master' of https://github.com/life2play/freshJakarta
Merge branch 'master' of ssh://github.com/life2play/freshJakarta