Merge branch 'master' of http://github.com/TheArchitects/Spillio into view-refactoring
Merged with latest master, started fixing some things
Revert "Merge pull request #21 from TheArchitects/view-refactoring"

This reverts commit fa5bbb25c26b509bc85da65039749575a13a54c8, reversing
changes made to 50e5ff597c829757647f533e671018847076a684.
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
Merge branch 'group-controller', remote-tracking branch 'origin' into group-db-view