Add amount support from map descriptor
Merge branch 'develop' of github.com:ggj/ggj14 into develop