added display current logged in user
fixed display username error
Merge branch 'developing'

Conflicts:
	app/controllers/conditions_controller.rb
	app/views/medications/_medication_fields.html.erb