Merge branch 'davidstack-master'

Author: scottfrederick

cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/domain/InstanceStats.java

@@ -31,14 +31,14 @@ public static class Usage {
 
 		private double cpu;
 		private int disk;
-		private double mem;
+		private int mem;
 		private Date time;
 
 		public Usage(Map<String, Object> attributes) {
 			this.time = parseDate(parse(String.class, attributes.get("time")));
 			this.cpu = parse(Double.class, attributes.get("cpu"));
 			this.disk = parse(Integer.class, attributes.get("disk"));
-			this.mem = parse(Double.class, attributes.get("mem"));
+			this.mem = parse(Integer.class, attributes.get("mem"));
 		}
 
 		public double getCpu() {
@@ -49,7 +49,7 @@ public int getDisk() {
 			return disk;
 		}
 
-		public double getMem() {
+		public int getMem() {
 			return mem;
 		}