Merge branch 'develop' (read more)

Deleted in the merge:
* combat_management.cpp
* todo.txt

Amended in the merge:
* server/enemy_factory_interface.hpp
* server/server_application.hpp
* server/server_internals.cpp

That version of combat_management.cpp was not what I was looking for. I'll
try again, this time by working my way down from SerialPacket. It's worked
in the past as far as establishing a standard goes.

todo.txt was deleted in this commit, but will be carried over into the
next develop branch.

I'll release a new demo build without changing the version number, since
there are no functional changes.

todo.txt

@@ -1,39 +0,0 @@
-* I need to keep the documentation up to date. Namely, the GDD is getting out of date.
-* How many lookups is the map system using?
-* Add the serial packet to the network utility
-
---Naming conventions--
-
-I need to define the differences between several different terms i.e. naming conventions.
-I may also need to rewrite some variable names.
-
-* User: This is the individual who is playing the game
-* Player: A synonym for a user
-* Character: This is the actual player character in the game
-* Username: This is the name of the player; ususally kept private
-* Handle: This is the name of a character
-* Avatar: This is the name of the sprite used by a character
-
---ServerApplication's methods--
-
-These interact with the database file, making the server a persistent system.
-
-* CreateUserAccount
-* LoadUserAccount
-* SaveUserAccount
-* UnloadUserAccount
-* DeleteUserAccount
-
-* CreateCharacter
-* LoadCharacter
-* SaveCharacter
-* UnloadCharacter
-* DeleteCharacter
-
---Battle System--
-
-CombatPortal:
-	x, y
-	list<Character>
-	list<Monster>
-	//...