fix minor bug roll over / out
Merge remote-tracking branch 'origin/master'
add Activities in Menu