Merge branch 'master' into ddf-sparksql-1.1.0
add mem-size-detection.sh to detect memory
Merge branch 'ddf-sparksql-1.1.0' of https://github.com/ddf-project/DDF into ddf-sparksql-1.1.0

Conflicts:
	spark/conf/ddf-env.sh