add manual transaction for admin to insert bill of previous date, modify transfer cp
Merge branch 'user' of github.com:dpentajeu/beijingbakedfish into user
add contact no in user dropdown list
Add date filter into transaction history
Fix sms undefined id variable issue
Fix roles based transaction history view
modify food point to redemption point, block registration at home page
add manual transaction link for admin
Added curl and image modifier extensions
Upload image on purchase create
add sms quota counter, add title for transaction history report, add edit bank account link on withdraw page
fix transaction history report (view all), add CP point in transaction, fix pin bug upon transaction, add transfer cp function to admin
add staff identity and control the menu
fix the top header menu
add captcha and add pin required to transfer cp
Merge branch 'user' into binarytree

Conflicts:
	protected/controllers/MemberController.php
	protected/views/layouts/main3.php
Insert binary nodes on activation and update on binary network view