put some stuff that we may want to use later out of the way
Merge branch 'feature/issue/#14' into develop
reinstate mouse keys in gameplay
Fixed map dragging

Merge branch 'feature/issue/#14' into develop

Conflicts:
	love2d/state/states.lua
Save/Load map. (press "s" and "l" key)
Merge branch 'develop' of https://github.com/nczempin/lizard-journey into develop

Conflicts:
	love2d/main.lua
Merge branch 'develop' into feature/issue/#14