Merge pull request #70 from spotfinder/karina

changing label names
added a AdminController