Merge remote branch 'origin/master' into demo-pom
add note about demo pom
add docs about demo pom usage
clarify directory in which to invoke mvn deploy
clarify directory in which to invoke mvn
Merge remote branch 'upstream/master' into demo-pom
Merge pull request #46 from bhamail/demo-pom

Demo pom
Update Docs/ServletSingleSignOnSecurityFilter.md

There is no waffle-servlet.jar in the distribution.
Merge pull request #47 from diroussel/patch-1

Update Docs/ServletSingleSignOnSecurityFilter.md
waffle-shiro: add new waffle-shiro component with basic realm implementation

This currently only supports username/password authentication.  Support for "negotiate"
will require a custom authentication token, a shiro security filter, and minor
enhancements to the realm.

Based on work discussed in the following ticket:
https://issues.apache.org/jira/browse/SHIRO-385
waffle-shiro: add eclipse project files
waffle-shiro: add tests
waffle-shiro: apply EPL license headers to new java source files
changelog: update for addition of shiro integration
Updated CHANGELOG.
pom: update versions to 1.6-SNAPSHOT

This should put them in the state that the maven release plugin expects for performing the 1.6 release.
Merge pull request #49 from davidmc24/update-pom-1.6

pom: update versions to 1.6-SNAPSHOT
Added cross-platform SPNEGO to the list of related products.