hujnya
Merge branch 'work' of https://github.com/Nik-Gleb/Planner into work

Conflicts:
	src/com/simProject/planner/Planner.mxml
	src/com/simProject/planner/PlannerAPI.as
	src/com/simProject/planner/Version.as
	src/com/simProject/planner/core/PlannerScreen.as