Hotlinking protection added + Comments synchronisation with D7 branch