security update
Merge branch 'master' of https://github.com/herophuong/drs

Conflicts:
	app/admin/summary.rb