Merge branch 'integration' of…

Merge branch 'integration' of http://gitlab.pakgon.com/Smart_Core_connect/core-connect into integration

# Conflicts:
#	www/src/Template/Users/signup.ctp

www/src/Template/Users/signup.ctp

@@ -469,7 +469,6 @@
 
 
 <!--------------------------------- confirm password ------------------------------ -->
 <!--------------------------------- confirm password ------------------------------ -->
 <script>
 <script>
-
     function check_phone() {
     function check_phone() {
     e_k=event.keyCode
     e_k=event.keyCode
     //if (((e_k < 48) || (e_k > 57)) && e_k != 46 ) {
     //if (((e_k < 48) || (e_k > 57)) && e_k != 46 ) {