Deleted some useless files
Fixed a lot of bugs
Merge origin/master