..
fix conflicts
add tabhost at bottom
view #2