changed projects basedir
Merge branch 'project_template' into develop
update gitignore