Client re-designed. Very close to v1.0.
Merge origin/master