Merge branch 'master' of github.com:bay6/union
fix sort bug
Merge pull request #172 from mouse-lin/master

use gem mysql2 all envs
Merge pull request #167 from kaku87/fixbug

fix sort bug
Fixed #148
Create dev_doc.markdown
Update README.md
local database
add inherited_resources
add notice
add content for project
add messages
add messages in user_bar
add rspec tests
modify the action of messages
Merge branch 'master' of github.com:bay6/union
Merge pull request #177 from caok/master

add notice and message
Merge pull request #174 from bay6/add_content_for_project

add a content for project show page....
second events
add new action
merge