Adding new model mapping with annotations and custom formatting functions
Merge branch 'master' of github.com:joshdholtz/Protocol-Android