Add upload image function
Merge branch 'master' of https://github.com/JaneJung/epicshaker.git

Conflicts:
	EpicShakerApp/.classpath
	EpicShakerApp/AndroidManifest.xml