Commit para conseguir fazer pull
Merge branch 'master' of ssh://github.com/xresende/fac_code

Conflicts:
	MatlabMiddleLayer/Release/machine/LNLS1/StorageRingData/LowAlpha/LOCO/2014-04-28/LOCO_symm1_a6qf01_2p134.mat