Corrected overlapping tags
Merge remote-tracking branch 'sebsauvage/master'

Conflicts:
	inc/shaarli.css
Disables the update check and so prevents the unwanted connection