BeforeMerge
Merge branch 'master' of https://github.com/DSilence/Messanger

Conflicts:
	Encryption.sdf
	Encryption.v11.suo
Merge branch 'master' of https://github.com/DSilence/Messanger
Qt project