..Normalize line endings..
Merge branch 'master' of github.com:Kauko/kiigameEditor

Conflicts:
	setup.py
Merge branch 'develop' of github.com:Kauko/kiigameEditor into develop