Prepping for merge
Prepping for merge
Merging master
Added routing to admin side