Merge branch 'dev2' into integration

* dev2:
  Change in dev2
Change in dev1
Merge branch 'dev1' into integration

* dev1:
  Change in dev1
Clean up jake files
Merge branch 'dev2' into integration

* dev2:
  Change in dev2
Cleaned up README
Resolved merge conflicts
Cleaned up README
Resolved merge conflicts