First
Second
Merge branch 'master' of github.com:masterinho52/nxjbs

Conflicts:
	App_Code/TB53_CDRs.cs
	App_Code/crmAccounts.cs
	Form1.Designer.cs
	Form1.cs