55
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_v4_20_0_0.xml
	app/app.iml
	app/src/main/java/bitgroup/bloomme/activity/SignInActivity.java
	app/src/main/res/layout/signin_screen.xml
55