added music  and preferences not ideal
merge with  master
music not want white screen
preferenceactivity
Merge remote-tracking branch 'origin' into service
add style;
merge hell;

Conflicts:
	app/src/main/java/com/beautyteam/smartkettle/Fragments/DeviceInfoFragment.java
	app/src/main/java/com/beautyteam/smartkettle/Fragments/NewsFragment.java
	app/src/main/res/layout/fragment_add_device.xml
	app/src/main/res/layout/fragment_add_task.xml
	app/src/main/res/layout/fragment_device_info.xml
	app/src/main/res/values/strings.xml
МЕЧ
yet commit;
Merge remote-tracking branch 'remotes/origin/service' into database

Conflicts:
	app/src/main/java/com/beautyteam/smartkettle/LoginActivity.java
	app/src/main/res/layout/fragment_add_task.xml
	app/src/main/res/values/strings.xml
русский отсчет времени
correct doubleTouch
авторизованный пользователь сразу перенаправляется на MainActivity
Кнопка удаления стала видна
double MainActivity solved
correct Action Bar