+
Merge branch 'master' of https://github.com/Gnappuraz/check_it.git

Conflicts:
	src/it/hackaton101/checkit/rest/Activities.java