Upgdating to 2013.04 changes... (incomplete)
Completed update for 2013.04 model
Added support for advanced searching options
Updated dasein-util dependency
Merge branch '2013.02' into develop

Conflicts:
	pom.xml
Merge pull request #1 from greese/develop

Develop
Merging 2013.02.2 bugfixes
Fixing issue with adding firewall rules with -1s for ports. Bumping pom
to 2013.02.3-SNAPSHOT.
Updated org in pom
Added comma stripping method for tags
Fixed early timeout issue when waiting for machine image creation
Improving root disk identification
Setting vm's vlan id to the first vlan found
Fixing private address id so it includes the vlan id
Fixing bug identifying template id for a server.
Removing vCloud Express from description
Merge branch '2013.02' of https://github.com/erik-johnson/dasein-cloud-terremark into develop

Conflicts:
	pom.xml
	src/main/java/org/dasein/cloud/terremark/compute/Template.java
Updating dasein-util version
Improving logging
Refactoring launch methods to remove duplicate code and fixing a bug
when setting and parsing the image href tag for a server launched from a
catalog item.