First part of class of 2013-10-01
Merge branch 'master' of git@github.com:gbesancon/seismic-physics.git

Conflicts:
	.project