Merge pull request #6559 from jitendrapurohit/CRM-16877

CRM-16877 -- Include ID when editing 'block' fields (+ allow deletion…

diff --cc CRM/Contact/BAO/Contact.php
Simple merge

diff --cc CRM/Contact/Form/Contact.php
Simple merge

diff --cc CRM/Contact/Form/Inline/Email.php
Simple merge

diff --cc CRM/Contact/Form/Inline/IM.php
Simple merge

diff --cc CRM/Contact/Form/Inline/OpenID.php
Simple merge

diff --cc CRM/Contact/Form/Inline/Phone.php
Simple merge

diff --cc CRM/Contact/Form/Inline/Website.php
Simple merge

diff --cc CRM/Core/BAO/Address.php
Simple merge

diff --cc CRM/Core/BAO/Block.php
Simple merge

diff --cc CRM/Core/BAO/Website.php
Simple merge