move configuration files into /etc
Merge branch 'master' of https://github.com/xiezuming/nirvanaWeb
Merge branch 'master' of https://github.com/xiezuming/nirvanaWeb
Merge branch 'master' of https://github.com/xiezuming/nirvanaWeb
Merge branch 'master' of https://github.com/xiezuming/nirvanaWeb

Conflicts:
	application/config/config.php