fixed problem with user_controller tests
Merge branch 'master' of https://github.com/seismicIain/Seismic
merging data