ms2
Merge branch 'master' of https://github.com/xw65/law_info_search

Conflicts:
	milestone2/app/models/info_query.rb
	milestone2/app/models/info_query.rb~
Merge branch 'master' of https://github.com/xw65/law_info_search