update travis-build
Merge branch 'master' into staging

Conflicts:
	Gemfile.lock