Merge branch 'master' into messages_sharedpref

Conflicts:

WhatsYourStory/app/src/main/java/com/example/si543/whatsyourstory/Messag
esActivity.java

WhatsYourStory/app/src/main/java/com/example/si543/whatsyourstory/Shared
PreferencesUtility.java