Encrypted slack API token after regen
Merge branch 'develop' of github.com:snipe/snipe-it into develop

Conflicts:
	.travis.yml