travis
Merge branch 'master' of github.com:wheelcms/wheelcms_users

Conflicts:
	.travis.yml