Set C++11 standard flag to compile.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.cproject