admin page done
Merging issue-18 into develop and resolving conflicts