Chenge in dev1-grunt
Merge branch 'dev1-grunt' into integration-grunt

* dev1-grunt:
  Chenge in dev1-grunt
Chenge in dev2-grunt
Merge branch 'dev2-grunt' into integration-grunt

* dev2-grunt:
  Chenge in dev2-grunt
Cleaned up LICENSE