Try to figure out the issue on localization from server side data.
Merge remote-tracking branch 'origin/localization' into localization

Conflicts:
	src/main/webapp/app/common/scripts/filters.js
	src/main/webapp/app/common/scripts/services.js