fixed basket
update
update encyclopedia
update bask
Merge branch 'master' of https://github.com/Evrika/Vidal