JR 2014 03 18
Merge branch 'master' of github.com:masterinho52/OrtXla into JFAM

Conflicts:
	ortoxela/Login.Designer.cs
	ortoxela/Login.cs
	ortoxela/Resources/Logo final.jpg
	ortoxela/ortoxela.csproj