structure ORM complete
Merge branch 'develop' of https://github.com/psychic-archer/BrainstormR into develop