t
Merge branch 'master' of https://github.com/laplace1984/FreetManager.git

Conflicts:
	FreetAlarmManager/res/values/com_crashlytics_export_strings.xml