admin page done
Merging issue-27 into develop and resolved conflicts