Logics
Merge branch 'master' of https://github.com/Adonai/GsmNotify

Conflicts:
	res/layout/settings_fragment_2.xml