kyoto and swpc
Merge branch 'master' of https://github.com/rweigel/datacache

Conflicts:
	app.js
	plugins/default.js
	plugins/swpcKpAp2Day.js
adding new api options
Merge branch 'master' of https://github.com/rweigel/datacache