Merge branch 'hotfix/bug_fix'
Fixed an issue which caused gene.jsp to get a null pointer exception.
Merge branch 'hotfix/support_new_dbuser' into develop