Changes made for common build
Changes made for common build

Conflicts:
	Buildfile