Merge pull request #143 from RTakes/conflictRes

Fixed admin conflict issue
fixing admin page
Merge pull request #144 from RTakes/conflictRes

fixing admin page
Merge pull request #145 from COPPER-BOBCAT/staging

Staging