1.6.3 Lots of bug fixes

git-svn-id: https://plugins.svn.wordpress.org/client-dash/trunk@998680 b8457f37-d9ea-0310-8a92-e5e31aec5664