CoreBug Related Changes
CRM-14704 fix: in this fix, the selected records are editable on activity form
Merge pull request #3304 from pratik-joshi/CRM-14704

CRM-14704 fix: in this fix, the selected records are editable on activity form
CRM-14508 update access.tpl

changed title and description for action name=core.manage
Revert "Merge pull request #3282 from colemanw/memberVisibility"

This reverts commit ce68481190840ee772e92eb1b16561abfaaedd32, reversing
changes made to 189c9c560d9f67961fc3756333c06fa520d93fec.
Merge pull request #3307 from kurund/membership-fix

Revert "Merge pull request #3282 from colemanw/memberVisibility"
Merge pull request #3280 from atif-shaikh/CiviCoreBugs

CoreBug Related Changes
Merge pull request #3306 from joannechester/master

CRM-14508 update access.tpl
CRM-14627 related - civicrm navigation inconsistent

https://issues.civicrm.org/jira/browse/CRM-14627
Merge pull request #3309 from monishdeb/CRM-14627

CRM-14627 related - civicrm navigation inconsistent
CiviTest - Fix gitignore for truncate.xml
CiviTest - Remove & don't generate truncate*.xml

These files don't appear to be used:
 * A quick grep for "truncate.xml" (etal) doesn't find any matches
 * Munging or deleting the file doesn't yield any new errors when running a test-suite (CRM_Core_AllTests)
Merge pull request #3310 from totten/master-truncate-xml

CiviTest - Remove unused files ("truncate*.xml")
CRM-14700 - Fix membershipType visibility in schema and tests
Merge pull request #3311 from colemanw/membershipType

CRM-14700 - Fix membershipType visibility in schema and tests
comment fixes & spelling
CRM-14197 towards refactoring form specific actions back onto the form as part of
figuring out how to set membership entity id on line item (preliminary simplication
Merge pull request #3312 from eileenmcnaughton/CRM-14197

CRM-14197 code refactor of membership post process
pass isTest & lineitems into processContribution

further refactoring to pass more params into smaller functions to make fixing membership line items doable

fix on previous refactor

Conflicts:
	CRM/Member/Form/Membership.php
Move the create CMS user onto the form function

move create CMS user back onto form & encourage passing of membership id to renewmembership function

create user AFTER processing membership in case if fails & all is lost