social media integration
Merge branch 'master' of https://github.com/elxnis/MyCityAndroid

Conflicts:
	src/uk/gov/glasgow/mycity/PushActivity.java