merge Daniel_ver & Kevin_ver

Not sure whether this version is OK for Kevin 's environment
Server files added

package and path are important for compile