upd
Merge branch 'master' of https://github.com/vortex314/projects

Conflicts:
	Common/src/BipBuffer.cpp
Merge branch 'master' of https://github.com/vortex314/projects
separate Property and Prop