kerosine-16 add facebook integration
de tests verbeterd, maar fixtures moeten nog
Merge branch 'master' into facebook
Merge branch 'master' into facebook

Conflicts:
	app1/models.py
just small things
Merge remote-tracking branch 'origin/master'