ACR\¦
Merge branch 'master' of github.com:kskom/Mumumu

Conflicts:
	Resources/searchwin.js