Merge pull request #206 from COPPER-BOBCAT/staging

Staging
added comments in server code
Reversed sorting
Added inline editing
added div vs card
fixing conflicts
Merge pull request #209 from RTakes/conflictRes2

Adding admin features