Webtest Core bugs
CRM-14683 Fixed constraint violation when batch update for grant is performed

----------------------------------------
* CRM-14683: Update Grant causes DB Error: constraint violation
  https://issues.civicrm.org/jira/browse/CRM-14683
views-upgrade-error : helper method to detect upgrade mode. this is used in civicrm.views.inc
WebTestFix
WebTestFix Further Changes
Merge pull request #3255 from Edzelopez/CRM-14683

CRM-14683 Fixed constraint violation when batch update for grant is perf...
Merge pull request #3260 from atif-shaikh/WebTextFix

Web text fix
Merge pull request #3254 from jitendrapurohit/Webtest_Core_Bugs

Webtest Core bugs
Merge pull request #3257 from pratik-joshi/views-upgrade-error

views-upgrade-error : helper method to detect upgrade mode. this is used in civicrm.views.inc
CRM-14115 - adding help block to explain the limit count for dashlets.

----------------------------------------
* CRM-14115:
  https://issues.civicrm.org/jira/browse/CRM-14115
Merge pull request #3264 from davecivicrm/CRM-14115

CRM-14115 - adding help block to explain the limit count for dashlets.