Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
fix 3
fix 3
fix 3
fix 4
fix 5
fix 5