Modified features to hold category, and added requested annotion types
Initial commit of Hussain's feedback tool
Testing sendgrid, will be removed eventually
Fooling around with bugmuncher
Fixes for EC2 server
Have to merge though technically this is a fast-forward
Minor changes to send without storing image on server
Put all Feedback stuff in one folder
Using the real e-mail address
Added RNA category
Fixed default colouring and text size of new annotations
Fixed broken links to old amazon server
Merge branch 'master' into alpha
Merge branch 'newAnnotations' into alpha
Hussain's updates for IE
Minor changes to Hussain's fix
Merge branch 'alpha' into kineticUpdate