am 18fa3d36: Merge "Changed MAP version from 1.0 to 1.1, since this is what...
am 18fa3d36: Merge "Changed MAP version from 1.0 to 1.1, since this is what was actually implemented" into klp-dev
* commit '18fa3d36':
Changed MAP version from 1.0 to 1.1, since this is what was actually implemented