Move map data into sub-element (@todo: XSLT could be optimized for that), several bug fixes
Missed one
Merge branch 'master' of git://github.com/nursix/eden