ready for merge the up-to-date beta0 project
fixed confilict
fix gitignore