GrandCanonical
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/faunus/group.h
	include/faunus/move.h
	include/faunus/species.h
	src/species.cpp
indent, comment
indent, comment
gcmol page
permissions,deletes
permissions
permissions
permissions
permissions
Merge pull request #56 from LukasSukenik/master

Re-done pull request