# Conflicts:
#   abweb/js/pickup/pickup.js

Add missing code

See merge request !30

implement main title for send message screen

See merge request !32

# Conflicts:
#	abweb/html/common/header.html

implement main title for message detail screen

See merge request !31

Feature/1.0 check web dev kdh 2

See merge request !29

Feature/1.0 check web dev imai

See merge request !25

# Conflicts:
#	abweb/html/dashboard.html
#	abweb/html/push-message-list.html
#	abweb/js/dashboard/dashboard.js

Feature/1.0 check web dev 50265

See merge request !23

This reverts commit 9b8745f7.

This reverts commit 66f8ca41.

This reverts commit 44d046d9.

This reverts commit 17845026.

This reverts commit 5a241cea.

This reverts commit c4206814.