[TASK]Added device type differentiation in breakpoints. And cleanup.
[TASK]Updated mobile template.
Merge remote-tracking branch 'origin/development'