Want to pull so I push
Merge branch 'asier'

Conflicts:
	res/values/strings.xml