nothing new to be commited
and again
Merge remote-tracking branch 'origin/developer'

Conflicts:
	Library/Library.WindowsClient/MainForm.cs
Update .gitignore
some clean up
Delete licenses.licx
Delete licenses.licx
Merge remote-tracking branch 'origin/developer'
changed end of line