Merge branch 'WXY' into LF
Merge branch 'LF' of https://github.com/l741589/GooCoo into LF
new master page By LF
after merge LYZ 7_25
Merge commit 'baceed57904d7b6bce427e9bf27894491ceaf097' into WXY
添加javascript引用，背景图片
search页面初步
添加对server的依赖
a
pull from branch LYZ
Merge branch 'LYZ' into OYF
after merge LYZ
push 20130727_2036 by LF
push 20130727_2126 by LF
Merge remote-tracking branch 'origin/LYZ' into OYF

Conflicts:
	GooCooAdmin/DealDialog.xaml.cs
	GooCooAdmin/MainWindow.xaml
	GooCooAdmin/Properties/Resources.Designer.cs
	GooCooAdmin/Properties/Settings.Designer.cs
还有部分接口没有实现，初步和林凡merge
Merge remote-tracking branch 'origin/LF' into OYF

Conflicts:
	GooCooAdmin/DealDialog.xaml.cs
	GooCooAdmin/LoginDialog.xaml
	GooCooAdmin/MainWindow.xaml
	GooCooAdmin/Properties/Resources.Designer.cs
	GooCooServer/Handler/GetBookByBorrow.cs
	GooCooServer/Handler/GetUserByBorrow.cs
	GooCooServer/Utility/Util.cs
push again
test commit
Merge remote-tracking branch 'origin/OYF' into LF