no message
Merge branch 'master' of https://github.com/CtoTeam/cto-android-project
Merge branch 'master' of https://github.com/CtoTeam/cto-android-project

Conflicts:
	CertificateChecker/res/layout/fragment_main.xml