Merge branch 'github/master'
Merge branch 'github/master'
Merge branch 'master'
Front end stuff
Merge branch 'github/master'
Merge branch 'chris'

Conflicts:
	app/views/seismic_index/index.html.erb
Small style fix