refactored admin.html with directives
added directives file
merge fixed