Integrated jarvis in shaarli
Merge branch 'master' of https://github.com/hackEns/Jarvis_web

Conflicts:
	tpl/jarvis_web.html