Merge branch 'dypage'

合并jeffrey代码

Conflicts:
.gitignore
app/views/admin/projects/_column_list_edit_box.html.erb
config/database.yml