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