Merge branch 'master' of https://github.com/semyont/ProjectAHA

Conflicts:
	Master.master