Update move.h
Merge pull request #8 from bjornstenqvist/master

get quadrupoles
fixed cigar compilation
Merge pull request #9 from mlund/patch-1

Update move.h
Merge branch 'master' of https://github.com/mlund/faunus
updated scatter
Space, energy and moves are now templates.
all tests pass with templated energy and moves
titrate example preparation
removed windows line endings
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/faunus/move.h
	src/species.cpp
fixed stockmayer
unittests pass
fixed Tensor input/output operators
Added spc water test
update
simplifications
update