11
Merge branch 'master' of github.com:xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo