closed #23
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/modules/presence/modules/ModulePresence.php
	system/modules/presence/templates/presence_list.html5