Merge pull request #10 from starteam/develop

Ongoing work
Merge pull request #12 from starteam/develop

Adding Soy Compiler
Merge pull request #14 from starteam/develop

Merging Soy to Master
Adding StarBiochem to index.html
Merge branch 'develop'

* develop:
  Update to StarX
  Moving to StarX/main.js
  Syntaxic changes
  StarX fixes
  Add stargeneticsyeast to starx
  Minor changes.
  Adding StarGenetics project to mappings
  rename libs to lib
  Adding Google Analytics Library
  Remove debug statement
  Typescript Library jQuery Declaration

Conflicts:
	mapping.txt
	src/index.html
Merge pull request #21 from starteam/develop

Autodiscover StarX
Merge branch 'develop'

* develop:
  Adding underscore
  Formating changes
  Update stuff
  Adding jquery-ui.d.ts
  Added ping
  Fixes issue with edX
  Adding CORS to serve.py
  Change autodiscovery

Conflicts:
	mapping.txt
Merge pull request #27 from starteam/develop

Update master
Merge pull request #29 from starteam/develop

Develop
Merge pull request #32 from starteam/develop

Minor fixes
Merge pull request #34 from starteam/develop

Speedup DOM Inserts
Merge pull request #36 from starteam/develop

Develop
Merge pull request #38 from starteam/develop

Develop
Merge pull request #40 from starteam/develop

	Remove http w/ location.protocol
Callback
Merge branch 'develop'

* develop:
  Callback
Merge pull request #41 from iceraj/master

Callback
Merge pull request #42 from starteam/master

Callback