# Conflicts:
#	test/common.py

decompose_power -> keep_phase_information

See merge request !145

Removed duplicates of files and unused reference

See merge request !146

Misc tweaks

See merge request !138

Sphinx docs

See merge request !140

# Conflicts:
#   docs/source/conf.py
#   docs/source/field.rst
#   docs/source/index.rst

Added first methods for __repr__

restructured docs: include apidoc support for module index, added copy of gallery and introduction of nifty1 docs, changed to rtd theme and bug fixes

Sphinx docs

See merge request !139

Spherical plots

See merge request !128

Master

See merge request !137

# Conflicts:
#   nifty/sugar.py

Master

See merge request !136