Merge branch 'master' of http://github.com/TheArchitects/Spillio into view-refactoring
Merged with latest master, started fixing some things
Fixed bug that made navbar break if user had not created an account yet
Removed unnecessary container from soem views
Merge pull request #22 from TheArchitects/view-refactoring

View refactoring