testing
Testing2
Merge branch 'staging'
Changed style for smartphone