Fix #20
Fix #10
Merge branch '2.0.0' of https://github.com/resilva/opendata into 2.0.0

Conflicts:
	application/assets/javascripts/application.js
Fix #21