FX-147, FX-149, FX-150
Updated more files for move to org.
Merge pull request #30 from fix8/master

Updated more files for move to org.
merged against dev
Merge pull request #32 from syegres/fixfor_fx-116-1

merged against dev
Merge remote-tracking branch 'upstream/dev'

Conflicts:
	ChangeLog