pictures work
Merge branch 'master' of https://github.com/ranokmai/wmm

Conflicts:
	project.properties