Adding javascript
Merge remote-tracking branch 'origin/master'

Conflicts:
	DS/PHP/produkt.php