Fix #770 - Return memory and swap (real) size in JSON
Merge branch 'fix-770-return-memory-swap-in-json' of https://github.com/guestisp/tsuru into swap