Merge branch 'master' into develop
Merge branch 'master' into develop
gemfile lock
Merge branch 'master' into release/1.1.0

Conflicts:
	Gemfile.lock
add license route
Merge branch 'release/1.1.0'