Merge branches 'guster' and 'guster' of https://github.com/gusterwoei/Nissan into guster
Merge branch 'guster' of https://github.com/gusterwoei/Nissan into guster
Slight design changes in fragment_main