commit21072014g

consolidated js into one place.