Renamed classes and annotations, manifest class is a singleton
Merge branch 'master' of github.com:hilljh82/metadata