Updated travis configuration - rspec
Sync dev branches(origin and local)

Conflicts:
	.travis.yml