Atrium code base
Merge branch 'master' of github.com:jon-edery/Open_Atrium_2.0