Updated GCC to 4.9.1 after update to Ubuntu 14.10
Merge branch 'master' into v7client

Conflicts:
	Makefile