Merge branch 'master' into Ahmed
Incorporated Alex's diary and other stuff
Added some of John's stuff, waiting for A, J, & K
Merge branch 'Ahmed'

Conflicts:
	Troll/bin/Troll.apk
	Troll/bin/classes.dex

Troll/bin/dexedLibs/android-support-v7-appcompat-fc214a640bb79a12095a41e
bd9171942.jar

Troll/bin/dexedLibs/google-play-services_lib-e5eb1253bb1207a030aeb31f302
603b6.jar
	Troll/bin/resources.ap_