Merge tag 'NBIA-MASTER-6_0-20140317-1' into TCIA-6_0

Fixed GUI and Rest API Performance issue

Conflicts:
	software/nbia-ctp/src/gov/nih/nci/nbia/dbadapter/NCIADatabase.java
	software/nbia-domain/.gitignore
	software/nbia-download/.gitignore
	software/nbia-web/src/ncia_messages.properties
	software/nbia-web/webapp/HTML/LoginFailure.html
	software/nbia-web/webapp/HTML/help/Application Support.10.1.html
	software/nbia-web/webapp/HTML/help/Getting Started.3.2.html
	software/nbia-web/webapp/HTML/help/Getting Started.3.5.html
	software/nbia-web/webapp/WEB-INF/facelets/bodyHome.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/layout/appFooter.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/layout/appHeader.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/layout/footer.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/layout/mainLayoutTemplate.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/layout/mainMenu.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/layout/quickLinks.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/layout/subMenu.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/welcome.xhtml
	software/nbia-web/webapp/WEB-INF/facelets/welcomeText.xhtml
	software/nbia-web/webapp/css/styleSheet.css
	software/nbia-web/webapp/sessionExpired.jsp
	software/ncia-core-grid-transfer/.gitignore
removed old directories from merge mismatch.
Fix minor merge issues found on review.
Merge branch 'TCIA-master' into TCIA-6_0