cos
Merge branch 'master' of github.com:onliq/dcf

Conflicts:
	include/userStatus.php
	index.php