20141228b
Merge branch 'master' of https://github.com/frederick623/sif

Conflicts:
	config.js
	dump.rdb