using restfb instead of CXF.
Merge branch 'master' of github.com:HogeschoolLeiden/website

Conflicts:
	pom.xml