commit with event fragment and login
Merge branch 'hye-dev'

Conflicts:
	OneBrick/app/src/main/AndroidManifest.xml
	OneBrick/app/src/main/res/values/strings.xml
Merge latest changes from hye-dev. Cleanup code.