fixed script and iframe problems
Merge branch 'master' of github.com:frevo-on-rails/frevo-on-rails.github.com