update travis-build
Merge branch 'staging'

Conflicts:
	Gemfile.lock