For UBIOPRED, only display GWAS and UPLOAD for Admins, for now as discussed
Merge with eTRIKS
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'github/master' into ubiopred-1.2

Conflicts:
	grails-app/views/layouts/_commonheader.gsp
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge branch 'etriks' into ubiopred-1.2
So it turns out there is yet onther road we should check when tomcat 8 is being used, Or on some manual deployement of tomcat 7 on Redhat. We add getResource. I have reformatted that code. I know people won't like it as it create all the path before checking them. Open for discussion :)
Merge branch 'master-foundation' into ubiopred-1.2
Merge branch 'master-foundation' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into ubiopred-1.2
Merge remote-tracking branch 'gitlab/etriks-1.2' into idbs.ewb-1.2