sync
Merge branch 'master' of https://github.com/diogonal/paraprj.git

Conflicts:
	UndeadInfection/.cproject
Merge branch 'master' of https://github.com/diogonal/paraprj.git
Merge branch 'master' of https://github.com/diogonal/paraprj.git