final changes before beta
Merge pull request #59 from jolevesq/last-changes

final changes before beta
Update README.md
Merge branch 'master' of https://github.com/GeoCanViz/GeoCanViz into phuppe-css-mods3

Conflicts:
	src/js/i18n/i18n.csv
Merge pull request #61 from phuppe/phuppe-css-mods3

Phuppe css mods3
Merge branch 'master' of https://github.com/GeoCanViz/GeoCanViz