updates
Merge branch 'master' of https://github.com/sfhatcompany/riverz-prestashop

Conflicts:

cache/smarty/compile/64/d8/59/64d859fc10feb1e4c7c2f6ca3a6f6fa7a5e238c3.f
ile.blockuserinfo.tpl.php

cache/smarty/compile/92/f2/13/92f2130a5d036a57055e2c14e27ca7dbe2ad849a.f
ile.nav.tpl.php

cache/smarty/compile/96/1a/e5/961ae59b21d78053c68612357aaf6769f54abb1c.f
ile.404.tpl.php

cache/smarty/compile/ca/92/96/ca9296bc56c9a3484fa3eb7d1b4fcbd093b68557.f
ile.errors.tpl.php