seperate map fragment
Merge pull request #4 from jnfer4211/map_fragment

seperate map fragment
toolbar + tabs
fixed merge conflict