UNSTABLE. Do not merge with this commit\!
Merge remote branch 'origin/niek_vanalles' into pieterb_conext
UNSTABLE. added beehub_resource.php
UNSTABLE, refactoring inheritance tree.
merged with niek_vanalles
Merge remote branch 'origin/pieterb_conext' into niek_vanalles