Add options parameter to function FlashDevice2 and remove unused function FlashDevice. Flash options are now visible at the top of the function tree instead of being buried inside function FlashDevice2.
Ensure that softloader can be flashed prior to, but along with either PIB and firmware or just PIB.
Merge remote-tracking branch 'upstream/master'
Revert "Ensure that softloader can be flashed prior to, but along with either PIB and firmware or just PIB."

This reverts commit 14905f6228b3c7773e089af36ba810eb48d896a2.
Check for Qualcomm OUI before using MMEName on vendor specific

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Fix object and program directory for VS2010 

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Merge remote-tracking branch 'origin/master' into drop_suid

Conflicts:
	plc/Makefile

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>