Changes made for common build
Changes made for common build

Conflicts:
	Buildfile
Merge pull request #2 from khyatidesai/K2

Changes made for the common build
Merge pull request #1 from intalio/K2

K2