文档页面及子页面排版
user和project界面 以及主页
修改了base_project
Conflicts: public/images/sidebar/add.png
Conflicts: app/views/layouts/base_users.html.erb
整理了sidebar布局
Conflicts: app/views/layouts/base_bids.html.erb