Pushing new changes
Merge branch 'integration' into pull_zhuweid_20130716143544066

Conflicts:
	source/app.specs/app.specs.csproj
	source/app/windows/UI.cs