before pull
Merge branch 'master' of https://github.com/VRyazanov/MAI

Conflicts:
	MAI.pro.user
Yeaaaah!!!