Merge pull request #3 from KnowSheet/review

Compilation fixes
Renamed files
Slightly reorganised statistics core
[android] Removed unneeded check for valid server