updated htaccess to work with shibboleth
Merge branch 'master' into develop

* master:
  updated htaccess to work with shibboleth