MalFunction
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rmss/conf/routes
change AreaActor
merege
malfunction for model
Merge pull request #5 from qianyu09/master

malfunction for model