Update .gitignore
Delete licenses.licx
Delete licenses.licx
some clean up
Merge remote-tracking branch 'origin/developer'