| Merge branch 'master' into homeFragment | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/WorkListViewAdapter.java | 
|---|
| app/src/main/res/layout/fragment_edit.xml | 
|---|