componenta + js
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	www/js/main.js
Merge branch 'development' of https://github.com/BrunoPuzjak/Sanax into development