File load added
Merged
Added some animations
Bug fixed
Merged branches