testes travis
	Merge branch 'master' of github.com:cepheros/segadmin