pre-master merge
Merge branch 'master' into frank_bug_fixes
basic security for user profile
Merge pull request #59 from HexagonStorms/frank_bug_fixes

Frank bug fixes