Merge branch 'wikiconstitucion' of github.com:DemocracyOS/app
Merge branch 'master' into development