Pushing new changes
Updated
Merge branch 'master' into pull_atpaton_20141113200355591

Conflicts:
	source/app/containers.basic/BasicContainerSpecs.cs