admin and web page refine
Merging issue-24 into develop and resolving conflicts