Updated javascript
Merge remote-tracking branch 'origin/macbook_changes' into from_usb

Conflicts:
	js/main-v2.js