committed stuff to make jimmys stuff work
Merge branch 'master' of github.com:ranokmai/wmm

Conflicts:
	project.properties