Merge pull request #12 from Magenic/master

Merging in changes from the mainline.
Implemented security changes based on CSLA service locator
Merge pull request #33 from jwendl/master

Here are the changes to get authentication working