Merge pull request #131 from TheWeatherCompany/develop

Add missing machine types, remove deprecated machine types, support for getting userdata
Recursion bug, optimisations, formatting.
FB 4309: correct max IOPS is 4000
Merge pull request #134 from maksimov/develop

Recursion bugfix, FB 4309
XML streaming added to public image search to avoid OOP.

Conflicts:
	src/main/java/org/dasein/cloud/aws/RegionsAndZones.java
	src/main/java/org/dasein/cloud/aws/network/ElasticIP.java
	src/main/java/org/dasein/cloud/aws/platform/RDS.java
Merge pull request #137 from maksimov/develop

XML streaming added to public image search to avoid OOP.
Revert "TheWeatherCompany/grid-api/issues/#722"

This reverts commit 71fb611bf61fd20b87b84d5b842c210865ffceff.
Merge pull request #84 from greese/develop

Merge Dasein upstream.
WIP: Fixing stateless static IP tests
Fix for Windows VM password capabilities (FB 4319)
Merge pull request #138 from maksimov/develop

Develop
Fixed a unit-test error
Merge pull request #141 from maksimov/develop

Fixed a unit-test error
TheWeatherCompany/grid-api/#722
Fix for incorrect XML stream parsing in image search.
Fix for password callback set upon instance launch.
Merge pull request #143 from maksimov/develop

Fix for incorrect XML stream parsing in image search.
Reverting VM capabilities change
Merge pull request #145 from maksimov/develop

Reverting VM capabilities change
fix for MachineImageServiceTests.testList and MachineImageServiceTests.testListByAccountId

looks like it was broken after merging
upstream dasein changes merged