testing iframe with erb
Merge branch 'iframe'

Conflicts:
	app/views/catarse_wepay/wepay/review.html.erb
	catarse_wepay.gemspec