javascript mock up
Merge remote-tracking branch 'origin/newOne' into newOne

Conflicts:
	FundFinancialsSCIDB/src/main/webapp/WEB-INF/spring/root-context.xml
designed page
Merge remote-tracking branch 'origin/newOne' into newOne

Conflicts:
	FundFinancialsSCIDB/src/main/webapp/WEB-INF/views/fundfinancials.jsp