Set training mode in master properly this time
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
More JS 1.5 stuff