| Merge branch 'master' into feature/#170_create_page_edit | 
|---|
| .idea/misc.xml | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/SendScreenShotActivity.java | 
|---|
| app/src/main/res/drawable/icon_jen_1007042258.png 0 → 100644 | 
|---|
|  | 
| app/src/main/res/layout/activity_animation_detail.xml | 
|---|
| app/src/main/res/layout/activity_send_screen_shot.xml | 
|---|
| app/src/main/res/menu/botton_nav_icon.xml 0 → 100644 | 
|---|
| app/src/main/res/values/strings.xml | 
|---|
| build.gradle | 
|---|
| gradle/wrapper/gradle-wrapper.properties | 
|---|