Remove +1 from parsePriority

Signed-off-by: Jeffrey Miller <jeffmax@gmail.com>
Update minimum Django version to 1.4.12

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #300 from cbmi/phenotype_magic_number

Remove +1 from parsePriority
Remove run-tests.sh, test_suite.py is preferred

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Updated Phenotype model and refractored code

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>
Merge pull request #302 from hassanNS/issue-294

Updated Phenotype modal
Merge remote-tracking branch 'fork/master' into adam_stash