minor update (pre-release v2.1)
Merge branch 'master' of ssh://github.com/xtr4nge/module_karma

Conflicts:
	_info_.php
minor update (pre-release v2.1)