Merge pull request #6 from intalio/K2

Updating fork
Merge pull request #7 from intalio/K2

Updating fork
BPMS-1002 license expiry in login page of dashboard
Merge branch 'K2' of github.com:satish-pokala/security into K2
Removed license changes in security because it will compile from common.rb
Merge branch 'K2' of github.com:intalio/security into K2