-am "disqus"
Merge branch '2.0.0' of https://github.com/resilva/opendata into 2.0.0

Conflicts:
	application/assets/stylesheets/screen.css
Merge branch '2.0.0' of https://github.com/resilva/opendata into 2.0.0
Merge branch '2.0.0' of https://github.com/resilva/opendata into 2.0.0
Add disqus style.
-am "disposition disqus"
Merge branch '2.0.0' of https://github.com/resilva/opendata into 2.0.0