Fixes #11. Hide link to show cancelled orders when it's empty
Merge branch 'master' of https://github.com/rede-gcr/noosfero into cirandas
Fix delivery methods edition/creation process

 * Fixes #6
Merge branch 'master' of https://github.com/rede-gcr/noosfero into cirandas
Merge branch 'master' of git://github.com/CIRANDAS/noosfero-ecosol into cirandas