misk
Merge branch 'master' of https://github.com/awersatos/IAR-System
12
Merge branch 'master' of https://github.com/awersatos/IAR-System

Conflicts:
	IAR/Brelok_MFU v 1.00/Brelok_MFU v 1.00.dep
	IAR/MFU v 1.00/MFU v1.00.dep
	IAR/TEST/STM32-DISCOVERY/TEST_AES/TEST_AES.dep
	IAR/settings/MFU Master workspace.wsdt