update cross study query
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb

Conflicts:
	src/main/java/org/strasa/web/page/navigation/user/SidebarPageConfigAjaxBasedImpl.java
udpate navigation bar
update cross study query
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb