Remove general view tests
Redesign
Merge branch 'design' into develop
Merge branch 'develop' of github.com:kyle0421/fleeflee into develop