Macro to insert prescription
Design

Tweak to CSS for big headers in summaries
new 'dull' class to dull children
renamed event.hidden to event.deleted.
initial commit of new audit functionality
minor print js changes
Removed watermark styling (moved to module)
Add allergy string utility method
Merge branch 'development' of ssh://github.com/openeyes/OpenEyes into development
Merge branch 'development' of github.com:/openeyes/OpenEyes into development

(fixing one conflict after a pull)

Conflicts:
	protected/controllers/PatientController.php
whoops
added ability to delete events if you are the original creator and if the event is less than 24 hours old.
Put the delete button in the edit controls bar as this is a lot cleaner.
Fix chrome print timeout wrapper to handle csspath
Merge branch 'development' of ssh://github.com/openeyes/OpenEyes into development
Merge branch 'design' into development

Conflicts:
	css/style.css
implemented episode status rules.
Merge branch 'development' of github.com:openeyes/OpenEyes into development
Merge branch 'development' of github.com:/openeyes/OpenEyes into development
removal of fish
added prototype to readme
Design

New class for Patient Summary page design update