mudancas pequenas no pyring
resolvendo conflito entre versao lnls208 e xamd2 (pyring)

Merge branch 'master' of ssh://github.com/xresende/LNLS-MML

Conflicts:
	python/sirius_python/src/pyring/elements.py
	python/sirius_python/src/pyring/passmethods.py