move js files from core
whitespace
Merge branch 'master' into movejs

Conflicts:
	version.inc
version update