Merge branch 'hotfix/0.0.1.1'
don't error out if the root of a reshare of a reshare got deleted, fixes #3546
Merge branch 'hotfix/3546-reshare'
bump version to 0.0.1.2
port tagFollowings to BackBone
add simple background for unread messages/conversations mobile
changelog update before release
Merge branch 'release/0.0.2.0'

Conflicts:
	Changelog.md
	config/defaults.yml
we really need a new selenium release...
givup on installing FF16, just allow cucumber to fail until FF17 is supported
add email validation to invitations
Merge pull request #3748 from rschaden/3271-invitation-email-validation

3271 invitation email validation
update changelog [ci skip]
Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags

port tagFollowings to BackBone
updated changelog [ci skip]
rename the JS so the magic can return
add tests so it doesn't break again
improve behaviour of deselect all
Update changelog
Merge pull request #3737 from davecocoa/feature/2704-fix-aspects

Feature/2704 fix aspects