Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml

Signed-off-by: Miguel Angel <mipegir@gmail.com>
Merge remote-tracking branch 'origin/master'