Take a photo and save it online
Merge branch 'master' of https://github.com/Wallkers/Wallk

Conflicts:
	res/values/strings.xml