notify user if he is banned
conflicts are solved

Conflicts:
	res/values/strings.xml