Edited some js
Edited some js
Edited some js
Merge branch 'master' into Aci

Conflicts:
	.gitignore