tune meta store doc and clean up directory layout in gruntfile
resolve merge conflicts