new feature file
merged from natyahih
merge
Added admin.js
Merge branch 'develop' of https://github.com/natyanih/testrepo into develop