wireframe added
local version
Merge branch 'master' of https://github.com/caochun/SIMS

Conflicts:
	SIMS.v12.suo