Fix some issues related to AE's maps and add parameters for AE
Merge branch 'map_reorg' of github.com:ashabelnikov/secu3app into map_reorg