Fixed resource path
Merge remote-tracking branch 'origin/master'

Conflicts:
	bijais/src/main/webapp/WEB-INF/views/splash.jsp