Squashed commit of the following:

commit 07ca8b85c5e109cf779506143210c4d8e2d3b8e1
Merge: c2845b6 c6fe0c7
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 20 11:57:20 2012 +0800

    Merge branch 'feature/0320' into develop

commit c6fe0c72027565fa9f65b13b8b66d3786a05ac09
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 20 11:56:48 2012 +0800

    #3099二次修正

commit c2845b67a0d7c75fb0790f56218debb64bc8dc7b
Merge: 47b07c2 928b0d0
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Mon Mar 19 18:05:19 2012 +0800

    Merge branch 'feature/0319' into develop

commit 928b0d0d14ac55bf916a44fd4dbb81a9134e4057
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Mon Mar 19 17:52:47 2012 +0800

    #3099 前後台0316修改，done
    剩下首頁promo區塊

commit 47b07c2b9c12e418d2cc805563517b320e281514
Merge: 8fa2d82 c143764
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Fri Mar 16 16:01:09 2012 +0800

    Merge branch 'feature/0316' into develop

commit c143764f6c31e02f4383342f52d4e2cf43e3f75d
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Fri Mar 16 16:00:38 2012 +0800

    後台編輯相本修改

commit 8fa2d82cd85a3da29b5edd2af7e9779fc2b595da
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Fri Mar 16 11:38:06 2012 +0800

    後台post頁修改

commit c5d8f497c8a3fd5ca46e7a31d332c99d4d10973f
Merge: 18d1d16 618d718
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 15 19:23:58 2012 +0800

    Merge branch 'feature/0315_grid' into develop

commit 618d7185518092cae097852b09bb4d4f5cf7dec9
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 15 19:23:15 2012 +0800

    後台頁面改成grid

commit 18d1d16e490652e6ca61e186b4dba6dbcb083717
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 15 17:55:54 2012 +0800

    新增相本修改

commit d7f7f3fbc0c244f24a99f187973654028db74196
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 15 17:36:48 2012 +0800

    修改分類設定，分類無狀態

commit 3a3ea473470c124e8a029b567a2cf679ca0a67b3
Merge: 46390ad 7f661b2
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 15 17:08:07 2012 +0800

    Merge branch 'feature/0314_backend_comment' into develop

commit 7f661b2d8e51db410bc2e88bbf691fa1cb7a4254
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 15 17:06:23 2012 +0800

    修改連結顏色

commit 46390ad27f93e5cdeed810cd849546455988173f
Merge: 95c8360 9dc0916
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Wed Mar 14 14:37:18 2012 +0800

    Merge branch 'feature/0314_backend_comment' into develop

commit 9dc09167dea4d06011747e9d89c232b26f3b4558
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Wed Mar 14 14:35:51 2012 +0800

    後台回應設定頁面

commit 95c83604a7556c23bb175ec6d86246d1cb5a546d
Merge: 769e24b dddfdeb
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 16:57:48 2012 +0800

    Merge branch 'feature/0312_blog_issue_3067' into develop

commit dddfdeba66b8a507f97c28ae701f83e3e6adc396
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 16:56:57 2012 +0800

    修改排序樣式

commit 769e24bf7d11cf4538512df4d05bc34c8ee0ff3b
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 16:45:48 2012 +0800

    引用頁面修改

commit 50cb33c8f757aeb212f1f1aafe90c1c6572dbe1b
Merge: a234c1f 5147233
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 16:34:11 2012 +0800

    Merge branch 'feature/0309_blog_issue_3068' into develop

commit 5147233db43bb72d96742117841412f5aa5f041d
Author: Dahlia <fishball7557@Dahliade-MacBook-Pro.local>
Date:   Mon Mar 12 12:11:15 2012 +0800

    引用頁面調整完成

commit 211656827b286709c8be093c1af2493c288b4b74
Author: Dahlia <fishball7557@Dahliade-MacBook-Pro.local>
Date:   Fri Mar 9 19:14:43 2012 +0800

    引用管理列表

    僅剩表單上方按鈕調整位子

commit a234c1f5e30e513657bfa61c4e7ba3b63fbd4db1
Merge: a8f5633 18ca8a4
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 16:29:15 2012 +0800

    Merge branch 'feature/0309_blog_issue_3066' into develop

commit 18ca8a426b5f134c7b8575c51e799f97e16441c3
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Tue Mar 13 15:56:13 2012 +0800

    樣式調整

commit 69e1cc25eae506fa58181b9a7e55af3ed9adbd10
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Mon Mar 12 22:18:17 2012 +0800

    update

commit ff70e82d653caac140695f5dffef09e2432d65f4
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Fri Mar 9 19:31:10 2012 +0800

    相簿分類設定頁面、編輯相本頁面的列表區塊

commit a8f5633abe7db266eb87f5e614f3f9b20fc2528a
Merge: 1605d8d cf2d6a8
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 15:58:03 2012 +0800

    Merge branch 'feature/0309_blog_issue_3066' into develop

commit cf2d6a843a816d4ef68c8c9d823017f53f1a8d5f
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 15:57:42 2012 +0800

    album修改

commit 1dc6592236e0ed97d17161e5a9fce39fc98bb601
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Tue Mar 13 15:12:58 2012 +0800

    樣式調整

commit f0b1541656a7cb8303a3b16c11a9b1f39a27877d
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Tue Mar 13 02:26:21 2012 +0800

    完成 編輯相片頁面(edit_pics.html)、相簿分類設定頁面(classify.html)、編輯相本頁面(album/index)的layout
    新增相本區塊裡的表格切成partial
    修改左邊menu的"相簿管理"layout

commit 3cc565df2d40dbd17aca7f53d5ef0fb41dd7565e
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Mon Mar 12 22:02:36 2012 +0800

    新增相片的按鈕及表格區塊部分(表格部分切成paritial)
    編輯相片頁面的layout(未完)

commit fed22d988a9d1162ee23e03652748efcb120a751
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Fri Mar 9 19:31:10 2012 +0800

    相簿分類設定頁面、編輯相本頁面的列表區塊

commit 1605d8d6fc86d09e1696a14dc15f6c2e4033a796
Merge: ac6f858 0f20321
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 15:17:29 2012 +0800

    Merge branch 'feature/0309_blog_issue_3067' into develop

commit 0f20321549379c174ba57afdc1849db844044def
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 13 15:16:22 2012 +0800

    後台文章分類、回應頁修改

commit ac6f858928a1e3e45bacf00772222910c408417a
Merge: 060e715 1bcf7fa
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Mon Mar 12 19:43:56 2012 +0800

    Merge branch 'feature/0309_blog_issue_3067' into develop

commit 1bcf7fa199e82f91354181e867a1496d5b1e0d00
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Mon Mar 12 19:39:55 2012 +0800

    後台article/ comment與category

commit 060e7150294520888e3148bfff95096239086900
Merge: 9240cbf 8a0449f
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 8 12:15:26 2012 +0800

    Merge branch 'feature/0308_backend' into develop

commit 8a0449fdc37bff50ec77be0eda7fa3bbd5b08525
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 8 12:01:23 2012 +0800

    整合後台的view

commit 9240cbfa10c631c36eae1300a4c82e940cfe2dfc
Merge: 9ea73c4 a3a97fc
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Wed Mar 7 17:16:30 2012 +0800

    Merge branch 'feature/0307_blog_issue_3033' into develop

commit a3a97fc09e3a62bb1bbbe7abde1ac7990362c080
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Wed Mar 7 16:52:20 2012 +0800

    CSS調整:#section_main 連結文字大小、#section__text_ad

commit 9ea73c48bc0d4d90b0cefe594aaed5ed62b3b139
Merge: 69d4670 4cc8e10
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Wed Mar 7 14:55:28 2012 +0800

    Merge branch 'feature/0306_blog_issue_3054' into develop

commit 4cc8e104f0653aee82995610aad08b05afc07398
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Wed Mar 7 11:30:59 2012 +0800

    套版 css修正(sidebar)

commit aea5d9598b266b2174b12024635d238428a546f9
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Tue Mar 6 19:51:17 2012 +0800

    文章內頁、相簿頁套上layout

commit 69d4670e8411e5bc99a1bf17222b9bd02ceff3b4
Merge: da3cc61 d231208
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 6 19:09:14 2012 +0800

    Merge branch 'feature/0303_blog_issue_3054' into develop and fix conflict

    Conflicts:
    	source/stylesheets/main.css.scss

commit da3cc61598a2a6fdf8012ca8508d83f581736578
Merge: e3fa584 3f18333
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 6 19:06:47 2012 +0800

    Merge branch 'feature/0306_blog_issue_3033' into develop

commit 3f18333e864ad4b532645d02b68ccec616ba4365
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Tue Mar 6 19:03:21 2012 +0800

    首頁#section_main css調整

commit e3fa584ed99a9dc15c98384302601e803ba23878
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 6 18:19:39 2012 +0800

    修正conflict

commit e79222f899ce5489f0c92662b15d22bff49bf8c8
Merge: db04b8f 997809f
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 6 17:00:10 2012 +0800

    Merge branch 'feature/0301_section_main_3033' into develop and fix conflicts

    Conflicts:
    	source/layout.haml
    	source/stylesheets/_home.scss
    	source/stylesheets/main.css.scss

commit db04b8f2d8c6f5474f5bb8dbe88a24232f05a126
Merge: d9b84bb 7aeed97
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 6 16:53:40 2012 +0800

    Merge branch 'feature/0302_section_top_sidebar_3034' into develop and fix conflict

    Conflicts:
    	source/index.html.haml

commit d9b84bbf059b8194616d5e95ea6b455e0043557d
Merge: dc1d3a7 d723504
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Tue Mar 6 16:40:33 2012 +0800

    Merge branch 'feature/0303_blog_issue_3053' into develop

commit d23120803a1a15f6230b1b184738460861f1447f
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Tue Mar 6 14:25:57 2012 +0800

    文章內頁切版完成

commit b47f37a99cade3dc800f4643c4b57969694d5d5a
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Mon Mar 5 19:02:46 2012 +0800

    文章內頁layout
    >>標題、內容、閱讀相關文章

commit d72350488494e805cc27ab8244cf2153adf70342
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Mon Mar 5 18:32:58 2012 +0800

    user列表頁 #main

commit 96f8b70a27e8fc358703ecc61725c66dc2d49eb9
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Mon Mar 5 18:09:57 2012 +0800

    user 列表頁 sidebar

commit 7aeed97a697d64c31115a88554cbbe857e8a3736
Author: Dahlia <fishball7557@Dahliade-MacBook-Pro.local>
Date:   Mon Mar 5 13:51:45 2012 +0800

    done!

commit 4fd2dcc9066f84d77876cbec58bc970e09efd96f
Author: Dahlia <fishball7557@Dahliade-MacBook-Pro.local>
Date:   Mon Mar 5 13:51:33 2012 +0800

    done!

commit 40d1fc171d2e586f99445093877ab99ca849cc4f
Author: Dahlia <fishball7557@Dahliade-MacBook-Pro.local>
Date:   Mon Mar 5 13:11:45 2012 +0800

    刪除DS_store

commit 6762009d23c4a4cbe92792bc5a8287309087c296
Author: Dahlia <fishball7557@Dahliade-MacBook-Pro.local>
Date:   Mon Mar 5 12:50:26 2012 +0800

    熱門精選完成

    剩下位置微調，先commit

commit 0566e4bdd4e4c35e1d8ef67c8fd7e6cc58227641
Author: Dahlia <fishball7557@Dahliade-MacBook-Pro.local>
Date:   Mon Mar 5 11:32:10 2012 +0800

    首頁主要的個人管理區塊

    公告的位置會再調整

commit 619f13f6392800a872d930a503f40c16184f6d6c
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Sat Mar 3 19:01:39 2012 +0800

    usesr layout及列表頁

commit 5f4b8df965bb4fa00cd61184eb06737cf41ee6e1
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Sat Mar 3 18:51:40 2012 +0800

    update

commit 3c36f6f3f6be5876261f9418037ac8632d149cbf
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Sat Mar 3 18:48:50 2012 +0800

    album頁css調整
    個人文章頁面的dom(未完)

commit d1e0f95605f29ca5dc3ed7e8f982c0024eef48f5
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Sat Mar 3 15:50:14 2012 +0800

    ticket:3054 >相簿列表頁面(user/album.html) 基本layout完成

commit dc1d3a74c24747bdb3390e4dc87e61a8722cb2dd
Merge: d7b1ebf abf995c
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Sat Mar 3 11:09:07 2012 +0800

    Merge branch 'feature/0229_blog_issue_3032' into develop

commit 997809f33cf81dc3137502230a7fab33e5f29fc3
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Sat Mar 3 10:47:02 2012 +0800

    update

commit abf995c2ed4d89352665381bfa0e84d7f07c933d
Author: Jarea <jason.im@gmail.com>
Date:   Fri Mar 2 20:06:40 2012 +0800

    建立 user layout!

commit ea75fc56d1f7cd09e4f76df355bf40cd6fb9910b
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Fri Mar 2 19:56:20 2012 +0800

    完成切版部分基本的layout
     #section_main
       #main
       .sidebar
    及#section_text_ad

commit 086a4459369772b85613dfef856c84a7a67ff559
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Fri Mar 2 15:34:15 2012 +0800

    layout與index拆開

commit f94cc684b9d8c522c8c148909a4859ac6cafa3a3
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Fri Mar 2 14:23:02 2012 +0800

    #navi加入submenu

commit c31a139038095781a9ce4dc20178c4629941fb12
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Thu Mar 1 19:48:49 2012 +0800

    section_main css

commit a127d8ee0dd2c6b82a211b5643f30535fd0472d1
Merge: 50516b9 d7b1ebf
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Thu Mar 1 16:53:18 2012 +0800

    Merge branch 'develop' into feature/0229_section_main_3033

commit 50516b96eecac7115262d80ac388c3f41ea10152
Author: Amelie <Amelie@Amelie-MacBook-Pro.local>
Date:   Thu Mar 1 16:52:16 2012 +0800

    update section_main

commit d7b1ebf7513703933df58b3a81d41608fd0cf3db
Merge: 7517fdf 3a423fe
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 1 16:49:22 2012 +0800

    Merge branch 'feature/0229_blog_issue_3032' into develop

commit 7517fdf08105e0fe67b7ea9ab14985e2f8070a9d
Merge: 09e74ec 072da62
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 1 16:47:15 2012 +0800

    Merge branch 'develop' of github.com:jarea/blog-fe-view into develop

    Conflicts:
    	.gitignore

commit 09e74ec181b49f7ad505271216375f549a15ec2d
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 1 16:45:42 2012 +0800

    ignore

commit 072da62fa6d527db3ca85b4b49399f77adb69f81
Author: Jarea <jason.im@gmail.com>
Date:   Thu Mar 1 15:39:16 2012 +0800

    add ignore file!

commit 3a423fec6da9b73ad02132d7241daf6da99bfc58
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Thu Mar 1 15:13:30 2012 +0800

    首頁promo

commit bf5a0d1ad48242c5180e81fbd38c40d580e51fcf
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Wed Feb 29 19:16:07 2012 +0800

    layout header, footer

commit a4535fbc86d76e2d8af9ece2178606aa80f748ab
Author: Cherry <cherry.chen@olivinesoft.com>
Date:   Wed Feb 29 11:28:11 2012 +0800

    前台layout