Jira page
Jira page
Merge origin/master

Conflicts:
	src/main/webapp/Resources/js/sector.js
Merge origin/master

Conflicts:
	src/main/webapp/Resources/js/sector.js