Merge branch 'Quality'
Merge branch 'master' into Quality
Some bullshit
Merge branch 'master' into Quality
Merge branch 'Quality'
Some changes and one fix

The author part was fixed here
Merge branch 'Quality'

Conflicts:

war/WEB-INF/deploy/uibinderindex/symbolMaps/B473B3DBFCCBCC7F5C7B1D648A5B
57A1.symbolMap

war/WEB-INF/deploy/uibinderindex/symbolMaps/C512AB8ECED6555A01970F298981
C99A.symbolMap
	war/uibinderindex/B473B3DBFCCBCC7F5C7B1D648A5B57A1.cache.js
	war/uibinderindex/C512AB8ECED6555A01970F298981C99A.cache.js
	war/uibinderindex/compilation-mappings.txt
	war/uibinderindex/uibinderindex.nocache.js