Add income cap to 2012 calculations
Add income cap to 2012 calculations
Merge branch 'child-maintenance-amends' of github.com:alphagov/smart-answers into child-maintenance-amends
Reword gross income hint text
Merge remote branch 'origin/maternity-paternity-amends-previewable'
Update test context to reflect the response value
Merge remote branch 'origin/child-maintenance-amends'
Update some links in child maintenance calculator copy.

Reviewed by @steventux
Correct link in child maintenance outcomes
bumping plek to 1.0.0 and slimmer

...to 3.9.5.
Upgrade to Rails 3.2.11

Include xml_parser disabling.
Bump depended-on version of lograge

lograge < 0.1.0 is incompatible with rails >= 3.2.9 (see
roidrage/lograge@1b4767f4).
Duplicated Married Couples Allowance flow
Text amends and additional outcome phrase.

General punctuation changes.
Added a different phrase for someone who does not pay inheritance tax and does not have any fees to pay.
Copy change for no fee bullet points
Upgrade to rails 3.2.11
Merge branch 'bump-plek'

Conflicts:
	Gemfile.lock
Set appropriate env variables
Remove unnecessary i18n key
Merge remote branch 'origin/apply-for-probate-amends'