Change the library order of pthread in the Makefile for ubuntu 14.04
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
Merge remote-tracking branch 'origin/master'