Updated ShareActivity

not finished yet
solved merge conflict
merge conflict
merge conflict...
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team8