v2.1

new admob key
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/xml/pref.xml