more changes to project
Merge branch 'master' of github.com:agua0008/Advantage-Dev into r2