Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main.xml
	src/com/free/tshirtdesigner/MyActivity.java