added groups to facebook
Merge remote-tracking branch 'origin/master' into alexandru.buicescu
added dislikes
Merge remote-tracking branch 'origin/master' into likes-fix

Conflicts:
	purepython/urls.py
changed readme
Merge branch 'master' into stefans-branch
groups messages can now be seen from news feed
pic to toolbar
Merge branch 'stefans-branch'
Merge pull request #10 from pure-python/stefans-branch

pic on toolbar
consistent profile links
friend requests done
Merge branch 'stefans-branch'
Merge pull request #11 from pure-python/stefans-branch

consistent profile links
Merge remote-tracking branch 'origin/master' into alexandru.buicescu

Conflicts:
	fb/models.py
	fb/templates/index.html
	purepython/urls.py
Merge branch 'master' into stefans-branch
work in progress friends
vulpe's delete
Merge branch 'stefans-branch'
Merge branch 'master' of https://github.com/pure-python/the-first-ducks

Conflicts:
	fb/templates/index.html
	purepython/urls.py