few changes
Merge branch 'master' of https://github.com/groovehunter/openspirit

Conflicts:
	openspirit.make