added extensions
Merge branch 'master' of ssh://github.com/mkawalec/pumas

Conflicts:
	src/Serializer.cpp