Update themes
Merge branch 'master' of git://github.com/CIRANDAS/noosfero-ecosol into cirandas

Conflicts:
	public/designs/themes/cirandas-themes
Update theme