Twitter feed on hashtag added
Twitter feed on hashtag added
Twitter feed on hashtag added
Twitter feed service added
Merge pull request #43 from DotYou/Feature/BugFixes

Feature/bug fixes
Merge branch 'master' of https://github.com/DotYou/Socializr

Conflicts:
	web/app/boards/details.tpl.html
	web/app/header.tpl.html
	web/assets/style.css
Twitter feed frontend modified
Fixed bug in twitter service
Twitter feed on group page, directive added to parse tweets
Public profile page added
Merge pull request #44 from smekkie/master

Twitter feed service created
Hashtag can be changed by group admin
Merge pull request #45 from smekkie/master

Hashtag can be changed by group admin
mostly styling and js fixes
Merge pull request #46 from Hikariii/Feature/BugfixesAndStyling

mostly styling and js fixes
Hashtag can be changed by group admin
Merge branch 'master' of https://github.com/DotYou/Socializr

Conflicts:
	web/app/app.js
Added group image
Merge pull request #47 from smekkie/master

Images for groups
cookies for authorisation added