Merge remote-tracking branch 'origin/sheep_develop'

# Conflicts:
#	app/src/main/res/layout/login_act_layout.xml