add Makefile
add sql file.
update makefile
.update setting
alter make file
.
Merge branch 'core' into pic-vote

Conflicts:
	config/settings.js
	package.json
	public/js/index.min.js