Take ActionName attributes into account in ExpressionReader
Formatting
update buildpackage script

Conflicts:
	buildpackage/buildPackage.ps1