Merge pull request #29 from Thilina123/myBranch

abbreviations 2
Refactor some jsp files
Merge remote-tracking branch 'upstream/master' into myBranch