Extract #uri from #mobile_link_discovery
Add default ogp
Revert #uri to original and copy necessary part
Put default ogp depending on the status of ogp.rb
Check existence of @conf.options2['sp.selected']
fix error on image when edit mode #412

* 'formplugin' mode in update dispatch to higher priority
Merge pull request #413 from mayuco/add-default-ogp

Add default ogp
remove mobile link discovery tag because it is obsolete
tabify
move ogpimage under theme
update changelog
bundle update
bump version to 4.0.3.20140509
Revert "Local update"

This reverts commit 8197c9ec6887a7f6012a496db49ea8be022ba94e.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Follow upstream