Updated javascript
More javascript fixes

yaaaaaay!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend-lauren/js/lauren_functions.js