Merge pull request #1 from faridelnasire/master

White
Merge pull request #2 from faridelnasire/master

Admin now is in a separate directory
body

change
Merge pull request #2 from melissavdvlugt/master

body