qero pull comm
Merge branch 'master' of https://github.com/jnuzh/BookShareClient.git

Conflicts:
	res/values/strings.xml