Merge branch 'develop' into feature/lists-mvp

Conflicts:
	app/helpers/combos_helper.rb
Merge branch 'feature/lists-mvp' of https://github.com/DimitrisVainas/combogen into feature/lists-mvp