Merge pull request #14 from SGover/master

Merge pull request #12 from SGover/shahar
Merge pull request #16 from SGover/AdeelTariq-alpha

Merge pull request #13 from SGover/master
Merge pull request #17 from SGover/shahar

Merge pull request #14 from SGover/master
Merge pull request #18 from SGover/master

a
changes in Blocks and player
update
Merge pull request #19 from SGover/shahar

Shahar
Merge pull request #20 from SGover/master

update