Merge pull request #57 from octupszhang/master

basic support for heat event and heat resource
Issue #45 - retry support when tokens expire.  Also some code cleanup and simplification.
Update CHANGELOG.md
source formatting
Merge branch 'master' of https://github.com/gondor/openstack4j
fix logic issue with retries
source formatting, remove accidental debug from printing token
Add support for listing tenant users os().identity().tenants().listUsers(tenantId)
Issue #58
remove logging filter implementation but kept class for users using this to turn debug on.  Will be deprecated in an upcoming release with new ways to turn debug/logging on.

We are now using Jersey's built in LoggingFilter and using this class as the current property hook for backwards compatibility.
Update CHANGELOG.md
Enabled userdata on server creation
Added support for BlockDeviceMapping and servers booting from block device
added more options for block device mapping - sourceType, destinationType and deleteOnTermination
Merge pull request #60 from drerik/master

Enabled userdata on server creation
Merge branch 'for_pull_requests' of git://github.com/jsovicka/openstack4j into jsovicka-for_pull_requests

Conflicts:
	src/main/java/org/openstack4j/openstack/compute/domain/NovaServerCreate.java
Merge branch 'jsovicka-for_pull_requests'
Update CHANGELOG.md
Issue #55
fix test failures