[mod] avoid status class inheritance
Merge branch 'master' of https://github.com/tiltfactory/open-atrium

Conflicts:
	docroot/sites/all/modules/custom/oa_webagency/oa_webagency.pages.inc
Merge branch 'master' of https://github.com/tiltfactory/open-atrium