Merge pull request #1 from intalio/master

fetching updates
Merge pull request #2 from intalio/master

fetching updates before liferay changes
Merge pull request #3 from intalio/master

Merge New changes
Merge pull request #4 from intalio/master

Updating fork
Merge pull request #5 from intalio/master

Update fork
Changes made for common build
Merge pull request #8 from khyatidesai/K2

Changes made for the common build