Merge branch 'development'
Updating htaccess to force SSL
Updating htaccess to support SSL and fixing an issue with redirects
Merge branch 'https' into development