linux 25_11_2013
Merge branch 'master' of github.com:Clodo76/osiris-sps

Conflicts:
	client/src/plugins/python/environment.pyc
	client/src/plugins/python/pair_header_patch.pyc
Merge branch 'master' of github.com:Clodo76/osiris-sps

Conflicts:
	client/src/plugins/python/environment.pyc
	client/src/plugins/python/pair_header_patch.pyc
linux misc