Merge branch 'master' into #167-add-server-url-in-login-screen

# Conflicts:
#	app/src/main/java/jp/atled/xpoint/XpointApp.kt
#	app/src/main/res/layout/fragment_login.xml