added feature 1
added feature 2
added feature 3
fix for feature 3
added an ImageView
Merge branch 'hotfix/0.2' into develop
added the ic_launcher as an image
added feature 4
added the right id for the image of the profile
Merge branch 'feature/Major_feature_for_next_release' into develop
added the version code - version name
added feature 5
last minute change, rolled back the greeting
Merge branch 'develop' into release/1.0
Merge branch 'release/1.0'