Merge branch 'master' of https://github.com/AquaFlameCMS/AquaFlameCMS_Trinity into ghbb
Merge branch 'ghbb' of https://github.com/shenhuyong/AquaFlameCMS_Trinity into ghbb
Merge branch 'ghbb' of https://github.com/shenhuyong/AquaFlameCMS_Trinity into ghbb
Merge branch 'ghbb' of https://github.com/shenhuyong/AquaFlameCMS_Trinity into ghbb
Merge branch 'ghbb' of https://github.com/shenhuyong/AquaFlameCMS_Trinity into ghbb
Merge branch 'ghbb' of https://github.com/shenhuyong/AquaFlameCMS_Trinity into ghbb
corrections to ...Constant DBHOST,  DBUSER, DBPASS,  DB already defined in..including config.php multiple times and corrections to erroneo..
Merge branch 'master' of https://github.com/AquaFlameCMS/AquaFlameCMS_Trinity into ghbb