pairs lib complete

Signed-off-by: unknown <hlltchlltc@gmail.com>
modify userlib

Signed-off-by: unknown <hlltchlltc@gmail.com>
Merge branch 'master' of github.com:upairs/upairs

Conflicts:
	application/libraries/PairsLib.php
	application/libraries/UserLib.php