Merge remote-tracking branch 'upstream/master'

Conflicts:
	biojava3-structure/src/main/java/org/biojava/bio/structure/io/PDBFileReader.java
Merge branch 'master' of github.com:shantanusharma/biojava