Merge branch 'master' of github.com:caok/union
Merge branch 'master' of github.com:bay6/union
reverse
Update dev_diary.markdown
Update dev_diary.markdown
add one more schedule
open activity
rewrite the index function
rewrite the index function #229
Fixed #229
Merge branch 'master' of github.com:bay6/union
Merge branch 'master' of github.com:bay6/union
Update dev_doc.markdown
Update dev_diary.markdown
Create design.markdown
change month and week calc method
Merge pull request #235 from williamherry/hotfix/month-and-week-calc-method

change month and week calc method
Update design.markdown
Merge branch 'master' of github.com:bay6/union
move the project fetch bay6 function from seed to model #236