Merge branch 'master' into develop
case 2048 - Alllow other modules to modify the online url.
Merge branch 'case-2048' into develop
Merge branch 'develop' of github.com:artesis/ting_relation into develop
Merge remote-tracking branch 'origin/develop'