Added .travis.yml
For coveralls
Merge branch 'master' into develop

Conflicts:
	Gemfile.lock