WIP
WIP
WIP
WIP
Merge remote-tracking branch 'origin/feature/ShortedUrlReplace' into feature/ShortedUrlReplace

Conflicts:
	.travis.yml