Merge pull request #184 from jcadek/master

READY! #20 #23 #116 #135 #136 Caching #21 Photo Comments #151 UI Mockup Updates #168 Random Choices #157 #175 #176 #177 #178 Fighting Fragments #183 Bug Fixed
Put 2 param Comment constructor back in... the test project was broken without it
Merge pull request #188 from klindenbach/master

Put 2 param Comment constructor back in... the test project was broken w...
removed placeholder text from delete
Story title EditText now only one-line
#67 Resolved all warnings, excluded test project from main project
Merge pull request #193 from klindenbach/67-Warnings

#67 Resolved all warnings, excluded test project from main project
Merge pull request #190 from klindenbach/oneline

Story title EditText now only one-line
Merge pull request #189 from klindenbach/master

removed placeholder text from delete
Prevented RANDOM from appearing when you have less than 2 pre-existing chocies