Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03

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

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

diff --cc CRM/Contact/Page/View/UserDashBoard.php
Simple merge

diff --cc CRM/Core/xml/Menu/Contact.xml
Simple merge

diff --cc CRM/Price/Form/Option.php
Simple merge

diff --cc CRM/Utils/System/Joomla.php
Simple merge