Update fixed data
Merge branch 'master' of ssh://github.com/atarba/mdm

Conflicts:
	src/com/mrg/mdm/bl/setup/BTCreateFixedData.cls