bloubloublou
Merge branch 'master' of github.com:matttbe/SIT

Conflicts:
	Gemfile.lock
Merge branch 'master' of github.com:matttbe/SIT
checkboxes for searching offers and-or demands