Photo stuff
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge pull request #188 from klindenbach/master

Put 2 param Comment constructor back in... the test project was broken w...
Story title EditText now only one-line
#67 Resolved all warnings, excluded test project from main project
#194 Pull out help dialog creation using XML and factory
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
#194 pulled out create page dialog into XML
#187 Moved page properties dialog to XML
#194 pulled out edit messages dialog into XML
#194 Pulled out edit conditionals dialog into XML
#194 pulled out edit decision dialog into XML
Merge pull request #195 from jcadek/master

Prevented RANDOM from appearing when you have less than 2 pre-existing choices
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 194-UI-XML

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Merge pull request #197 from klindenbach/194-UI-XML

194 ui xml
#196 Removing strings from UI part 1
Merge branch 'master' of https://github.com/klindenbach/301project