Character set
Merge branch 'master' of https://github.com/mborjesson/GameJam-1.0.git

Conflicts:
	data/images/characters/player/mainanim.png
	data/images/characters/player/mainstill.png
wrong merge
from develop
Release
fix parameters
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git into develop
some options fixes and some preparation for runnable jar
prepare some installer stuff
lots of updates!
updates to options (left, right-keys to toggle, shaders works without
restart)
installation of natives to be able to easily start game
fixed windmill spinning too fast when vsync is off
build script
other stuff
Merge remote-tracking branch 'origin/mb'

Conflicts:
	data/images/characters/player/mainanim.png
	data/images/characters/player/mainstill.png
removed
updated release build
updated a bit
updated yet again