annote activity
annote view done
Annotation activity
Fix conflicts... bin files