Added override buttons logic
Merge remote-tracking branch 'origin/oppg885'

Conflicts:
	css/blanks.css
	js/blanks.js