Fixed compiler errors.
Fixed the first bug preventing the game to start (still does not start).
Fixed/revered some of the changes in last commit. The game starts now.
Fixed crash due to change from int to float.
Moved the boat a bit in Lakeside so it does not get stuck directly.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/map.cpp
	src/mod/mod.cpp
	src/render_opengl/assimpmodel.cpp
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/TheJosh/chaotic-rage
Merge pull request #77 from esper/master

Fix int/float bug and minor cleanup