removed nnet, elm and data scaling
Merge branch 'dev'

Conflicts:
	server.R
	ui.R
removed remaining server variables current.*
Merge branch 'dev'
cleaned up after merge from dev