to fix make-distribution.sh: cp conf/*.template did not work, changed to cp conf/
Merge remote-tracking branch 'upstream/master'

Conflicts:
	make-distribution.sh
recover mis-deleted file
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixed a bug in cp conf files with wildcard
suggest sbt to check local maven repo under ~/.m2/repository