Merge pull request #1 from zyphlar/master

Getting the HSL copy up to date
Merge pull request #2 from zyphlar/master

Updating hsl repo
Merge branch 'master' of github.com:heatsynclabs/Open-Source-Access-Control-Web-Interface
Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface