Adds others shape on map to help draw
Reorganizes views
Merge branch 'master' of github.com:ekylibre/ekylibre
Cleans code