minor updates to UI side of things
merging changes from doug's awesomeness

Merge github.com:caoabunga/RemoteClientAOA

Conflicts:
	app/controllers/drug_controller.rb
	app/controllers/medication_controller.rb
	app/controllers/order_controller.rb
	app/controllers/pix_controller.rb
	app/views/monitor/watch.html.haml