test
test
test
Merge branch 'master' into owen1
Merge branch 'master' into owen1
1) Changed the main template to show/hide login/profile links
2) reverted some of the changes in the ctrl.chat.js after the server-side auth was added
3) added unit tests to ctrl.login.js
Merge pull request #36 from denisstepanenko/owen1

merging as can be merged automatically