add database
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	images/icons/facebook.png
	images/icons/logo_sunny.png
	views/index/index.phtml