function headers/cleanup
Merge branch 'master' of https://github.com/rbellido/Project

Conflicts:
	redesigned/modules/server_game_logic.cpp