Merged 'dev'.
Merged 'dev'.
rm button border on click
add reset on route change
small fixes