Updating code.
Merge branch 'master' of https://github.com/mwconceicao/octopus-frontend