allowed Iframe
an embeder was made to make embedly more managable
Merge branch 'master' of https://github.com/toppy42/partnerproject_site

Conflicts:
	linkshare/config/environments/development.rb
	linkshare/config/environments/production.rb
added an embeder class t deal with embedly