Merge pull request #1 from ikitty/master

修正字段属性
fix hostspirit editor's bug
v1.0.2
fix about.html
Merge pull request #2 from ikitty/master

修正数据初始化的小bug
Update JF to J
merge from remote
fix bugs
Merge pull request #3 from ikitty/master

编辑workspace时在模版中带入id参数
project go on
Merge branch 'master' of https://github.com/mamboer/nwapp
project .json
fix on workspace.html,update jquery.fanmenu to v1.0.1
Merge branch 'master' of https://github.com/mamboer/nwapp into ikitty-master

Conflicts:
	fwspace/default.html
	fwspace/js/data.Project.js
	fwspace/js/data.js
	fwspace/js/default.js
	fwspace/js/editor.workspace.js
merge lv master into alex branch