Merge branch 'master' of https://github.com/benbek/HereAStory-Android into Designing

Conflicts:
	.classpath
	assets/crashlytics-build.properties
	project.properties
	res/layout/activity_login.xml
	res/values/com_crashlytics_export_strings.xml
	res/values/dimens.xml
	src/com/hereastory/MapActivity.java
added graphics
integrated new desingns
populate hear story screen
small fixes
fixing layout
Merge pull request #23 from benbek/master

Incorporating directions and Green Marker
various fixes
removed TODOs
removed some warnings
small fixes
Merge pull request #24 from benbek/TomerLastTry

Automatically Merge.