Updated API interface to be compatible with the new version of the API

Types for comments and pins will be remapped as follows: 
"FORUM" -> "COMMENT"
"GENERAL MESSAGE" -> "ADMIN"
"TRASH PICKUP"/"HELP NEEDED" -> "MARKER"
Merge branch 'android-apiupdate' into android