2014 06 05
Merge branch 'master' of github.com:masterinho52/OrtXla
JR 2014 06 13
Merge branch 'master' of github.com:masterinho52/OrtXla

Conflicts:
	ortoxela/Properties/Settings.Designer.cs