test
tst
Merge branch 'master' of https://github.com/theswolf/SpeechReminder

Conflicts:
	.idea/copyright/profiles_settings.xml
	.idea/libraries/support_v4_19_0_1.xml
	.idea/vcs.xml
	speechreminder/build.gradle
	speechreminder/libs/quickblox-android-1.1.0.jar
	speechreminder/libs/sqlitedao.jar
	speechreminder/speechreminder.iml