First test for images as assets
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/on/puz/photobombsquad/FdActivity.java
Fix effect choice
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/org/on/puz/photobombsquad/R.java