Merge branch 'hotfix/hotfix-1.10.1'
Merge branch 'release/release-1.18.2'
Update database.php
Merge branch 'release/release-2.0'

Conflicts:
	application/config/database.php
Merge branch 'release/release-2.7'
Found the problem on app_bs2.js getJSON(URL)
Refactoring Assets directory and production re-configuration
fixed #7 Rename js method
Merge branch 'hotfix/hotfix-2.7.1' into develop