Merge remote-tracking branch 'origin/chart_luka'

Conflicts:
	smart-power-web/src/main/webapp/WEB-INF/ftl/index.ftl