added js
Merge branch 'master' of https://github.com/yaslisari/Aptana

Conflicts:
	template.html