merging with develop branch
fixed merge conflicts
preparing for merge with group_stuff
fixed merge conflicts
preparing for merge
fixing merge conflicts
preparing for merge
fixed merge conflicts
ajax call
fix conflict
merge conflict
fixed merge conflicts
fixed merge conflicts
views
fix conflict
ajax save data
Merge pull request #8 from JohannaMW/jeff_dev

Jeff dev
adjustments
conflicts
conflicts