version merged
Merge branch 'master' of github.com:cyhex/smm

Conflicts:
	tracker/tests/moodClientServerTest.py