Commit current progress
Include missing header
More refactoring
Small refactoring
Small refactoring
Small refactoring
Small refactoring
Merge branch 'master' into 2014-Refactoring
Server list refactoring
Merge pull request #1 from denji/2014-Refactoring

2014 refactoring