small upgrade

add some seeds
Merge branch 'master' of https://github.com/ciudadanointeligente/ongeneratorg

Conflicts:
	app/views/layouts/_navigation.html.haml