Do not ignore javascript.
Merge branch 'master-fullRepo' into archie

Conflicts:
	.gitignore