Pushing new changes
Pushing new changes
Merge branch 'master' into pull_shilin-he_20140327115953470

Conflicts:
	source/app.specs/utility/ContainerSpecs.cs