Dicionário
Merge branch 'master' of https://github.com/isel-27074/AVE-1213SI

Conflicts:
	CSharpEditor/Form.cs