web page and admin page changes
Merging issue-11 into develop and resolving conflicts