add sbtconfig and mysql params in config
Merge remote-tracking branch 'github/master'

Conflicts:
	dot_zshrc