Add the ability to change the user's image
Merge branch 'master' of https://github.com/sions/Birthday-android

Conflicts:
	app/res/values/strings.xml