Notes and folders most of the way done
Merge branch 'Fox-Working' of git@github.com:FoxUSA/OpenNote.git into Fox-Working
Misc Changes