404 errors taken care of.
More extensive access control system.
Merge remote-tracking branch 'origin/master'