fixed typo
Merge branch 'master' into rc

* master:
  fixed typo
  added nojs.html to tests
  removed reload button
  open external url
  layer testing
  torch turn on and off specs
  Removed deprecated specs and replaced with new jasmine testApp

Conflicts:
	testApp/config/application.coffee
support for steroids.layers.replace(preloaded)
Merge branch 'rc' into next

* rc:
  support for steroids.layers.replace(preloaded)
  fixed typo

Conflicts:
	testApp/config/application.coffee