backup commit
Merge branch 'master' of https://github.com/romaincheminade/Eve

Conflicts:
	examples/main/main.cpp