resolving conflicts in aminoacid and pdb entry
Merge branch 'master' of https://github.com/galicae/tina.git

Conflicts:
	src/bioinfo/proteins/PDBEntry.java