slide out menu v1
Merge remote-tracking branch 'origin/master'
resolved conflicts
side menu
Merge remote-tracking branch 'origin/master'
enabled menu
Merge remote-tracking branch 'origin/master'