conflit
Merge branch 'master' of https://github.com/lazarohcm/JClimber

Conflicts:
	JClimber-csharp.sln
	JClimber.sln
	JClimber.userprefs
Merge branch 'master' of https://github.com/lazarohcm/JClimber