Updated code - js split into files but no RequireJS (yet?)
Merge remote-tracking branch 'origin/master'