Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' (bugfix, read more)

Found an error in the SQL save statements; fixed.

Character positions are now saved between logins.
Stating to implement the combat system