Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
Conflicts:
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js