cleanup
Moved objects
Updated the mappers
Changed the server DAO to support the database changes
Merge pull request #16 from haavardlian/server-changes

Server changes