Altered filter options to match other implementations
Altered filter options to match other implementations
Removed username from core where it totally does not belong. good catch
Stas
Merge pull request #217 from unwin/develop

Removed username from core where it totally does not belong. good catch
:lipstick: Housekeeping

Conflicts:
	src/main/java/org/dasein/cloud/network/LoadBalancerSupport.java
Merge pull request #218 from maksimov/develop

Develop
Removed default capability values in favour of referring to getCapabilities() call.
Merge pull request #219 from maksimov/develop

Removed default capability values in favour of referring to getCapabilit...
Added one missing deprecated override
Merge pull request #220 from maksimov/develop

Added one missing deprecated override
fixed getInstance not passing some params it was given.
Merge pull request #222 from unwin/develop

fixed getInstance not passing some params it was given.
Merge pull request #71 from greese/develop

Merge upstream changes from greese:develop [2014-06-06]