working through tests for presentation functionality. TODO: Need to webmock ldap calls. AGH -___-
Merge commit '31980f34ddf066ceeeb1ded720d4b92040c07b51'
patch
fixed ability file
Merge branch 'stage'

Conflicts:
	app/views/tools/index.html.erb