Merge pull request #308 from rayeckel/master

fixed o snap crash bug
adding optimized js 09-13-2013 17:20:37
fixed merge conflicts
Merge branch 'spark' of https://github.com/rayeckel/ReadySpark into spark
Fixed critical edit action bugs
Merge branch 'master' of https://github.com/editure/sims
Fixed save action bug
Merge branch 'master' into spark
Merge branch 'spark' of https://github.com/rayeckel/ReadySpark into spark