FIX
Merge branch 'feature/chat' of github.com:fjordstrom/angular-firebase-chat into feature/chat