ese-unibe-ch/ese2011-team2 — comment on commit caba795c0bd9482b7f4a15aeb897ecb55aa6dd46
File:  line 0
By rathrio:

I merged the branch into the master, since we've basically finished working on the remove/edit -stuff. We can later make branches for more complex issues, as reto mentioned.