Conflicts with some (little ;) ) lags

+ Add new Options screen
* Options -> Controls (bug)
* Better ItemBar (but instances problem.....)
* Some things =)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mylife/org/game/GameState.java