-Optimized base activities to fit for single and two pane;
Merge remote-tracking branch 'origin/master'