Renamed annotation for mapping to MapConfig and added MapModelConfig
Merge branch 'master' of github.com:joshdholtz/Protocol-Android