Added resfams database and renamed basic annotation script.
Updated annotation_functional_selections.py. First working version.
Fixed merge problem
Merge commit '82e23bb0a'; branch 'master'