Merge pull request #5 from stormpath/master

Merging master to dev
Merge pull request #11 from stormpath/fix_error_with_stormpath_client_builder

Fix problem caused by the new ClientBuilder in Stormpath Java SDK
Merge branch 'master' into dev
Updated branch to reflect latest stable release (1.0.RC2)
Merge pull request #12 from stormpath/update_sdk_to_1.0.beta

Upgrade Stormpath to latest stable version
Merge branch 'dev' into cached_login_eviction_fix

Conflicts resolved:
	README.md
Users logged in using usernames are properly evicted from cache during logout
Merge pull request #13 from stormpath/cached_login_eviction_fix

Cached login eviction fix
[maven-release-plugin] prepare release stormpath-shiro-root-0.6.0
[maven-release-plugin] prepare for next development iteration
Added new WEB module and replaced JSP with Velocity
Merge branch 'dev' of github.com:stormpath/stormpath-shiro into social_login
Changed Social and Velocity code to version 0.7.0
web/pom.xml changed to 0.7.0-SNAPSHOT
README.md updated
Fixed failing tests after dev merge
Removed commented lines