garbage commit to fix stash issues.
The basics for Elastic Search are now in place.
Just need to apply them properly to our current project.
Merge branch 'master' of https://github.com/g-chag/CMPUT301F14T01-Team1Project

Conflicts:
	Yodelit/bin/MainActivity.apk
	Yodelit/bin/classes.dex
	Yodelit/bin/classes/com/example/yodelit/ElasticSearchManager.class
	Yodelit/bin/resources.ap_
	Yodelit/src/com/example/yodelit/ElasticSearchManager.java