Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/maprice/pointademo/PAAdActivity.java