Merge branch 'projects' into dev
Merge branch 'dev' into samples
Add two actions as samples#add_project and samples#delete_project
Samples edit page, projects association modification action needs to be complete!
Samples#add_project, #delete_project; association destroying needs to be complete
Finished ProjectSample association creation and deletion with ajax
Merge branch 'samples' into dev
Merge branch 'dev' into customers
Change customer's province column name to district, add district model
Bug fix for customers' new column name 'district'
Finished customers' district model, let people select and fix bugs
Merge branch 'customers' into dev
Rename roles.js.coffee to roles.js
Merge branch 'dev' into projects