Merge branch 'master' of git://github.com/piyushbansal/e-cidadania into piyushbansal...