changes
added loader
resolved merge
rebuilt toneden.js