folder support
Merge pull request #149 from daniellemayne/develop

folder support
Merge pull request #150 from unwin/develop

Another Omnibus
FB 5143. was blowing up with a NPE when trying to get disk size on
listProducts. Relates to FB 5133 as well.
Conflicts:
	src/main/java/org/dasein/cloud/google/compute/server/ServerSupport.java