Public Git Hosting - sgn.git/commit

commit	7762c091869d29f584bafb381c0c057f3a5a4e22
author	nickmorales <nmorales3142@gmail.com>
	Mon, 14 Aug 2017 20:30:55 +0000 (14 16:30 -0400)
committer	nickmorales <nmorales3142@gmail.com>
	Mon, 14 Aug 2017 20:30:55 +0000 (14 16:30 -0400)
tree	06ac11fc100c0605511fc1902f53a1b759537e14	tree \| snapshot (tar.gz zip)
parent	72db3351d82f967481d3327fa4fba1b8af11fc08	commit \| diff
parent	5742a59e0d78a37f5f3e0959ab83d59297c0f366	commit \| diff

Merge branch 'master' into topic/trial_treatments

lib/SGN/Controller/AJAX/FieldBook.pm	diff1 \|	diff2 \|	blob \| history
lib/SGN/Controller/AJAX/HTMLSelect.pm	diff1 \|	diff2 \|	blob \| history