Merge remote-tracking branch 'origin/master'

Conflicts:
	FORCE_SECURITY_WITH_MB_PLUS/businessinfo/Objects.local
	FORCE_SECURITY_WITH_MB_PLUS/datatypes/Objects.local
	FORCE_SECURITY_WITH_MB_PLUS/dl_settings.xml
	FORCE_SECURITY_WITH_MB_PLUS/dmd_open.local
	FORCE_SECURITY_WITH_MB_PLUS/logical/Objects.local

	FORCE_SECURITY_WITH_MB_PLUS/logical/entity/seg_0/273FEB3A-97B4-12D9-86C9-80304349C706.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/entity/seg_0/86447E88-1EB1-2340-5315-7F005F899C31.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/entity/seg_0/C5CD35B1-840C-D35E-8880-7809D658C6A0.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/entity/seg_0/EB541C9D-A71C-558D-A7AE-6157FD3E96ED.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/relation/seg_0/14DABF3D-944B-94B9-E79D-5713B7C77E66.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/relation/seg_0/5FBAA7A7-A4B9-71E5-7B38-587655B91B1B.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/relation/seg_0/714CE35D-9643-D45E-56A8-7D37978EA866.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/relation/seg_0/978FB094-ED74-1849-5F91-86F1E3482816.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/relation/seg_0/F7690877-B167-BC33-967B-B2AA5C79D3AA.xml

	FORCE_SECURITY_WITH_MB_PLUS/logical/subviews/5429535B-A1C8-E4E8-21BA-A32F043ECF09.xml

	FORCE_SECURITY_WITH_MB_PLUS/mapping/DeletedMap_RM451B68A7-E83C-AB26-41FA-66A9700CBDCA.xml

	FORCE_SECURITY_WITH_MB_PLUS/mapping/ExtendedMap_RM451B68A7-E83C-AB26-41FA-66A9700CBDCA.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/406197B0-AC3A7B725255/foreignkey/seg_0/942051A3-C09B-B58E-C0F4-96F2E9BABE98.xml
	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/DDLSelection.local
	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/Diagrams.local
	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/Objects.local

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/40620F35-8A15-0BBD-3B53-74061CCE16C0.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/727B7AE0-EF16-9F39-33FA-9527370EAC1A.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/756FCE5F-838B-48C6-6FE7-A01A2332E190.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/7909663B-6CD5-8B63-5A21-2876D382722E.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/83057370-8398-70ED-9EE8-873F2FC72248.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/A60C4C6F-4C5F-7DE4-44B1-8A963FE0E635.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/B15405A9-6E91-587D-EE9B-A417CFC515EC.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/D86E89AC-F32E-1FE6-14EC-E46B41B76196.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/D8A2FC05-78C5-5507-1E1A-FE7B3AEF85EC.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/foreignkey/seg_0/FBB68094-A23A-A705-EFA5-C39E706450BE.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/subviews/A7A8455E-DBCC-3F59-028F-34A22D64DE8C.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/1A7601E9-66E5-C9F5-4740-F2475D1862B1.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/1ECDC71A-BDD2-D131-2F18-5ACA06FD66F5.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/202F4B40-B611-E1AF-5EAB-EE97495739B0.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/49585900-DF65-E36D-772B-1B0C09829D99.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/6A8C1790-6A1B-4E92-8EAD-005B633764F1.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/6E7F26DF-EBA1-AD29-1801-99892025DEFD.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/7460CA6C-AC58-21A3-6708-FCA30A69E41A.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/781D1040-597B-34C1-3963-341859960238.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/7A70CAA9-4176-DDA4-C2AD-B515B320E6B3.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/9D2C5CC7-6DF2-C905-86A9-8BF08C8BD9BC.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/BCE23E1F-BAC1-7104-F537-748C670AA92B.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/F9099400-D966-7ACE-1C20-92DF0269A668.xml

	FORCE_SECURITY_WITH_MB_PLUS/rel/451B68A7-66A9700CBDCA/table/seg_0/FC64E16D-BDE9-1A4D-7F10-919FD2630D09.xml