Merge remote branch 'origin/master' into nosql

Conflicts:
	public/system/js/directory_controller.js
	public/system/tests/unittests/directory_view.js
Fixed the test environment which I merged wrongly some time ago
Solved issue #241: Members can now be promoted to admins before accepting the group invitation
dropdown sponsors
Merge branch 'nosql' of github.com:sara-nl/BeeHub into nosql
sponsors dropdown
solved conflicts