Merge branch 'master' of https://github.com/Lolita-wang/devart-template

Conflicts:
	project_summary.md