added url parser
Merge branch 'exane-master'

Conflicts:
	resources/assets/js/Chat.js