Removed constants.hpp, remaining constants move to config.hpp
Merge branch 'future' of github.com:wallix/redemption into future

Conflicts:
	core/config.hpp