Bug fixing, v2.4
String updates
Version increment
2.4.2 Bug fix
Ad changes
ad settings
Merge branch 'release/Release-14.06.20_2.4'

Conflicts:
	AndroidManifest.xml