Merge branch 'develop'
Disable public admin functions until we get a real security solution in place