Changed structure of user positions
Merge branch 'master' of https://github.com/stanbellcom/os2dagsorden

Conflicts:
	features/os2dagsorden_fields_and_content_types/os2dagsorden_fields_and_content_types.features.field.inc
	features/os2dagsorden_fields_and_content_types/os2dagsorden_fields_and_content_types.info
	features/os2dagsorden_sidepane_menu/os2dagsorden_sidepane_menu.module