Photo stuff
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Ability to search ES working. Android end of searching still to be done. Searchable Activity not launching when supposeed to.
Can now search and retrieve results from ES, display results and read stories when clicked on. ES only returning 10 results per query though
Searching works
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into searchBranch
#196 Removing strings from UI part 1
Searching and random story now work with ES. Just need to extend to work with locally stored data.
Merge branch 'master' of https://github.com/klindenbach/301project
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 196-UI-Strings

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
	res/values/strings.xml
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/EditStoryActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
#196 Finished removing all hardcoded UI strings
Translated to Russian
Merge pull request #199 from klindenbach/196-UI-Strings

196 ui strings
Resolved #201-5 and #201-6
Merge pull request #202 from jcadek/master

Fixing Broken Menus (Resolved #201-5 and #201-6)
Resolved 201-4 and fixed major bug in edit mode
Merge pull request #203 from jcadek/master

Resolved 201-4 and fixed major bug in edit mode
Fixed 201-2
Merge pull request #204 from jcadek/master

Fixed 201-2
Fixed 201-1