Merge branch 'Quality'
Merge branch 'master' into Quality
Some bullshit
Merge branch 'master' into Quality
Merge branch 'Quality'
Merge remote-tracking branch 'origin/master' into Quality

Conflicts:
	war/uibinderindex/compilation-mappings.txt
	war/uibinderindex/uibinderindex.nocache.js