1

1
Merge remote-tracking branch 'origin/master'

Conflicts:
	QtCppSecurity/QtCppSecurity.pro
	QtCppSecurity/main.cpp
	QtCppSecurity/security_ex1.cpp
	QtCppSecurity/security_ex1.h