Merge development -> require.js-bak2
Fix some var names in test
Re-add function deepFind to Simulator.js