fixing tests
Merge branch 'master' into revert_drop_snp_name_from_user_snps

Conflicts:
	db/schema.rb
Merge pull request #83 from tsujigiri/revert_drop_snp_name_from_user_snps

fixing tests