Working on implementing Jackson
Fixed some merged conflicts
Added admin module
Merge pull request #42 from tommyschnabel/Tommy

Tommy