add again node grunt bower
Merge remote-tracking branch 'origin/icoAndJshint-02'

Conflicts:
	src/main/webapp/WEB-INF/jsp/css-includes.jsp
	src/main/webapp/WEB-INF/jsp/js-includes.jsp