integration license ignore
Merge branch 'master' of github.com:mikeedwards83/Glass.Mapper
Merge branch 'hotfix/WindsorLoopIssue'
refactor of multi-interface work
Page Editor mode now respects Sitecore Field ID
Merge branch 'hotfix/issue31' into develop

Conflicts:
	.gitignore
allowing the user of anonymous types with render link and render image
half way through refactor to allow editable to render images and links
Changes to update methods for new attribute support
refactor to simplify editing methods
Merge branch 'feature/issue22' into develop
Merge branch 'develop' of github.com:mikeedwards83/Glass.Mapper into develop

Conflicts:
	Source/Glass.Mapper.Sc/GlassHtml.cs