View refatorada. #WIP
Merge branch 'develop' of https://github.com/monkshorin/projeto-s1 into develop