Upped version for new dev
Merge branch '2013.04' into develop

Conflicts:
	pom.xml
Merge branch '2013.04' into develop

Conflicts:
	pom.xml
Addressed conflicts
Fix for handling rackspace server firewall.
Merge pull request #12 from binod33/develop

Fix for handling rackspace server firewall.
Replaced reference
Merge pull request #3 from greese/develop

Develop
Fixed admin password parsing bug.
Merge pull request #15 from erik-johnson/develop

Password bugfix
* Updated copyrights to reflect the Dell acquisition of Enstratius
* Moved all http status code references from javax.servlet to Apache http components
Added optional, non-implemented argument for adding an explanation for audit trail purposes to termination
Added type parameter
added eclipse ignores
Changed group id security ingress rule to support actual group_id as opposed to cidr only.
Added checks and fix for null value returned by Nova for Any protocol in firewall rules.
Merge pull request #21 from tdhite/develop

Develop
Modified logic for ANY slightly
Fixed the "George is a bozo" bug
Fixed infinite loop in QuantumType getNetworkType() (essentially calling itself for the endpoint REST resource.