.
Merge branch 'master' of github.com:masterinho52/nxjbs into JFAM

Conflicts:
	Form1.cs