Moving the Rescue stuff.
Resolved refactor conflicts.
Merge branch 'master' of github.com:ukwa/shine
Refactored vis code into separate location.
Merge branch 'master' of github.com:ukwa/shine

Conflicts:
	shine/app/controllers/Application.scala
Resolved.
Merge branch 'master' of github.com:ukwa/shine

Conflicts:
	shine/app/controllers/Application.scala
Merge branch 'master' of github.com:ukwa/shine
Resolved whitespace conflict.
Resolved route conflict.
Resolved minor conflicts
Resolved minor whitespace conflict

Merge branch 'master' of github.com:ukwa/shine

Conflicts:
	shine/app/controllers/Application.scala
Resolved conflicts.
Added Concordance trial.
Removed old reference.
Resolved line ending conflict.
Resolved another line ending conflict.