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
Searching and random story now work with ES. Just need to extend to work with locally stored data.
#198 pulled out outdated TODOs
Translated to French
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into searchBranch

Conflicts:
	res/values/strings.xml
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Merge pull request #210 from klindenbach/198-TODOs

#198 pulled out outdated TODOs
Merge pull request #211 from klindenbach/196-UI-Strings

Translated to French
Merge pull request #214 from jcadek/master

Added Seekbars
Translated page ending
Added launcher and app icons
Merge pull request #215 from klindenbach/master

Spaciba
Merge pull request #218 from jcadek/master

Fixed fighting bug
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into searchBranch

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
Merge pull request #217 from tbendubois/master

Added launcher and app icons
Merge pull request #219 from KarlParkinson/searchBranch

Search branch
Refactoring, Phase 1
Refactoring, Phase 2: Split Controller into 3 controllers