update makefile inline documentation
make sure statements with different instructions get replaced with their respective content, fixes #49.
remove spurious library inclusion from packaged map.html
add catalan translations
update presets and their translations
update translations
Merge branch 'master' into gh-pages
update changelog