Merge branch 'master' of github.com:Seppone/objrec

Conflicts:
	.travis.yml
Merge branch 'master' of github.com:Seppone/objrec