moved function in js
Merge pull request #110 from mud-turtles-2014/json_fix

Fix the broken links
before pull down
Merge branch 'master' of https://github.com/mud-turtles-2014/Soapp
bug fix back button berfore heroku
fix merge
Fix merge conflict