V2.0
Merge branch 'sprint2' of https://github.com/rafalee/hera-mobile into sprint2