wip
Merge branch 'master' of github.com:jasonlu/drwho_admin

Conflicts:
	app/models/study_record.rb