Merge pull request #2 from aaronlifshin/master

Merging master into dev
private area creation fix if within private area. Also all other admin functions adjusted to work within private area
Fix password reset
Merge branch 'refs/heads/dev'