xp
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/values/defaults_strings.xml
	src/com/markupartist/android/widget/ActionBar.java
xp