Merge branch 'dev' of https://github.com/shengyongjiang/sinoramaoa into dev

Conflicts:
	.idea/workspace.xml
add note for some db correct ,see 2014/03/10
fix bugs of change afterblance < 0 instead of < -1000
cancel resturnt ,restid = 1
add new restaurant
delete rest id =4
add new rest
daily change ,to focus on checkout ,calcuate total price
finish change for diff price
add rest
add side menu
Merge branch 'dev' into dev_fea_diff_price
change db query to prevent sql injection
Merge branch 'dev' into dev_fea_diff_price
add diff price
and only checkeout the order where status = 1
finish change diff price for diff rest
not display rest at weekend
stage change
stage change
add rest
t