Workaround for activity infinite relaunch

fixes #390
Improved locale handling
Remove incorrect locale change workarounds
Merge branch '390-jellybean' of https://github.com/devrandom/Gibberbot into devrandom-390-jellybean

Conflicts:
	AndroidManifest.xml