change
REST Client setup
Merge branch 'master' of https://github.com/OneBrick/onebrick-android
Merge branch 'master' of https://github.com/OneBrick/onebrick-android
list update
commit with events list
Merge branch 'hye-dev'

Conflicts:
	OneBrick/app/src/main/AndroidManifest.xml