refactoring: delete ts and xid from models
Merge branch 'master' of https://github.com/Unact/Renew

Conflicts:
	app/models/renew_groups_ad.rb