Disabling the iFrame proxy for now.
updating poms for 0.3.5-SNAPSHOT development
updating poms for branch'release/0.3.4' with non-snapshot versions
Merge branch 'release/0.3.4'
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state