ViewPager added

Replaced tabs by ViewPager
Merging