Merge branch 'devA' of https://github.com/kincjf/pastelbook_w into devA

Conflicts:
	js/pb/ui/dlg_add_image.js

Signed-off-by: KimSeonHo <sinho0689@gmail.com>
Merge branch 'devA' of https://github.com/kincjf/pastelbook_w into devA

Conflicts:
	js/pb/ui/dlg_add_image.js