at
Merge branch 'master' of https://github.com/jiadw007/database.git
Merge branch 'master' of https://github.com/jiadw007/database.git
begin to modify themes
Merge branch 'master' of git://github.com/jiadw007/database

Conflicts:
	WebRoot/advanceSelect.jsp
	WebRoot/advancedSearchResult.jsp
continue on theme
theme
theme
Merge branch 'master' of git://github.com/jiadw007/database

Conflicts:
	WebRoot/selectTopBook.jsp
prepare to index.do
Merge branch 'master' of git://github.com/jiadw007/database
bug in payment.aid
before table view order
$(document).bind('pageinit', function() {}) fixed
before merge
Merge branch 'master' of git://github.com/jiadw007/database

Conflicts:
	WebRoot/WEB-INF/classes/database/action/CheckOutAction.class
	WebRoot/chooseShippingAddress.jsp
	src/database/action/CheckOutAction.java
before push
final version a
fixed some bugs

Signed-off-by: striges <sugar1987cn@gmail.com>
final bugs