Last changes MBA
Merge branch 'master' of https://github.com/velerelectronic/Teacher-Notebook

Conflicts:
	TeacherNotebook.pro.user