Merge branch 'Beta' of https://bitbucket.org/cmsteinBR/flatcam into Beta

# Conflicts:
#	locale/pt_BR/LC_MESSAGES/strings.mo
#	locale/pt_BR/LC_MESSAGES/strings.po