Merge branch 'integration' of http://gitlab.pakgon.com/Smart_Core_connect/core-connect into integration # Conflicts: # www/src/Template/Users/signup.ctp
