Update of SuperMAG
Merge branch 'master' of https://github.com/rweigel/tsdscc

Conflicts:
	index.htm