Daily commit
Merge branch 'origin/feature-je-bootstrap3'
Merge branch 'origin/feature-je-bootstrap3'
Picker updates