ajax call
fix conflict
merge conflict
views
fix conflict
ajax save data
adjustments
conflicts
conflicts
conflicts
group overview
Merge pull request #10 from JohannaMW/group_stuff

Group stuff