Added Travis file to master branch.
Merge remote-tracking branch 'origin' into feature/user-login

Conflicts:
	.travis.yml
Merge remote-tracking branch 'origin/feature/user-login' into feature/user-login