removed icons from buttons
change choose organization to buttons
change checkin checkout buttons to regular buttons
Merge branch 'stage'

Conflicts:
	app/views/tools/index.html.erb
update for feature specs. still not passing test - need to mock LDAP to get it to pass