add %c,%k1,%k2 to recognized maxima objects
Trac #8734: Make sage variables unique in maxima.
factor out missing assumption error handling; filter _SAGE_VAR_
fix typo leading to error
two further maxima calls adapted; two more doctests fixed
fix and generalize missing_assumption(); resp. doctest adaptions
add even more cases to add _SAGE_VAR_; fix doctests
Merge branch 'rev/8734' into tmp

Conflicts:
	src/sage/interfaces/maxima_lib.py
8734: more additions of _SAGE_VAR_ in doctests
8734: one more maxima call adapted; more doctests fixed
8734: more doctests fixed
8734: fix doctests
Improve sums of squares of integers
Merge branch 'develop' into t/8734/ticket/8734-1

* develop: (991 commits)
  Updated Sage version to 6.3.beta2
  avoid duplicate argument checking and documentation for %display
  fix docbuild due to backslash in output
  document the RIF comparison with infinity
  Reverts one doctest to old example, ignore last commit
  Reverted one example in doctest
  Removed trailing whitespace from last commit
  also accept %display typeset in ipython
  16199: documentation cosmetics
  Fix doctest failing on OS X on the last digit after upgarding numpy/scipy to 1.8.1/0.14.0
  trac #16387: expand doctest to also include initial and final states
  corrected spacings; extended one doctest
  added spaces after comment-symbol in code
  Trac 16224: add doctest
  updated examples from last commit
  Trac 11990: doctest for divergent sum error
  forbid conversion from unsigned infinity to RR, RDF
  fix addition/subtraction of unsigned infinity
  also add conversion (not: coercion) for CC -> infinity ring
  fixes and enhances hasse_invariant and hasse_invaraint__OMeara
  ...

Conflicts:
	src/sage/interfaces/maxima_lib.py
8734: rename private function, doctest it
Merge branch 'develop' into t/8734/ticket/8734-1

* develop: (184 commits)
  Updated Sage version to 6.3.beta3
  Support default arguments when starting the notebook server Warn if starting fails
  Trac #13422: Reintroduce a warning (but not an error) when the user supplies too few ticks to disambiguate the plot scale.
  Trac 8828: fix two other LaTeX errors
  Trac 8828: \eps should be \epsilon
  proofreading and fixing doctest failures
  16420: little tweaks: use module_morphism, sum_of_monomials, ...
  Review tweaks for Young's lattice and RSK thematic tutorial.
  Trac #13422: Reviewer suggestions.
  trac #14953: Moving the .html to EXT_CODE and using DOCTEST_MODE
  16405: fixed trivial doctest failure and ReST indentation
  auto expand log scale to include at least two major ticks
  trac #16323: several fix + doc
  New section for algebraic combinatorics tutorial on Young's lattice and RSK
  fix libgap conversion of huge integers
  changes necessary for the updated gap_packages tarball, which includes GAP's AtlasRep package now - necessary to fix GAP's TomLib package, but also useful on its own
  trac #16323: DF -> difference_family, change errors and more doc
  Trac #14209 - Forget assumptions from earlier doctest
  Trac #14209 - verify Maxima fix for doing improper integral twice changing answer
  Trac #15386 - document that Maxima 5.33 fixes this limit
  ...

Conflicts:
	src/sage/calculus/calculus.py
	src/sage/interfaces/maxima_lib.py
	src/sage/symbolic/integration/integral.py
	src/sage/tests/french_book/recequadiff.py
8734: merge conflicts
take back unrelated change
8734: doc cosmetics
Merge branch 'develop' into t/16007/ticket/16007

* develop: (1659 commits)
  Updated Sage version to 6.3.beta3
  Support default arguments when starting the notebook server Warn if starting fails
  Trac #13422: Reintroduce a warning (but not an error) when the user supplies too few ticks to disambiguate the plot scale.
  Trac 8828: fix two other LaTeX errors
  Trac 8828: \eps should be \epsilon
  proofreading and fixing doctest failures
  16420: little tweaks: use module_morphism, sum_of_monomials, ...
  Review tweaks for Young's lattice and RSK thematic tutorial.
  Trac #13422: Reviewer suggestions.
  trac #14953: Moving the .html to EXT_CODE and using DOCTEST_MODE
  16405: fixed trivial doctest failure and ReST indentation
  auto expand log scale to include at least two major ticks
  trac #16323: several fix + doc
  New section for algebraic combinatorics tutorial on Young's lattice and RSK
  fix libgap conversion of huge integers
  changes necessary for the updated gap_packages tarball, which includes GAP's AtlasRep package now - necessary to fix GAP's TomLib package, but also useful on its own
  trac #16323: DF -> difference_family, change errors and more doc
  Trac #14209 - Forget assumptions from earlier doctest
  Trac #14209 - verify Maxima fix for doing improper integral twice changing answer
  Trac #15386 - document that Maxima 5.33 fixes this limit
  ...