Merge branch 'index_games2' of gitlab.mpcdf.mpg.de:ift/NIFTy into index_games2

# Conflicts:
#	test/test_spaces/test_power_space.py
4 jobs for index_games2 in 6 minutes and 13 seconds (queued for 1 second)