skill tree, minor bug fixes with tile collision
merged seans changes