fix layout and avoid some warnings
Make icon sizing and anchoring configurable
fix changing language order (AQUARIUS-35)
Merge branch 'master' of github.com:aquaverde/aquarius-core

Conflicts:
	modules/maps/templates/formfield.gmap.tpl