server settings
Merge branch 'master' of https://github.com/gkodikara/ccc-line

Conflicts:
	application/config/config.php
	application/config/database.php
Merge branch 'master' of https://github.com/gkodikara/ccc-line
server db
Merge branch 'master' of https://github.com/gkodikara/ccc-line

Conflicts:
	application/config/database.php
Merge branch 'master' of https://github.com/gkodikara/ccc-line
Merge branch 'master' of https://github.com/gkodikara/ccc-line
Merge branch 'master' of https://github.com/gkodikara/ccc-line
Merge branch 'master' of https://github.com/gkodikara/ccc-line

Conflicts:
	application/config/database.php