Added updates to admin
Merge pull request #175 from RTakes/conflictRes

Added updates to admin
Merge pull request #176 from COPPER-BOBCAT/staging

Admin added reload