june 9 sahiti
june 9 - 2 - sahiti
Merge branch 'master' of https://github.com/itihas/lm

Conflicts:
	LifeMarker/bin/LifeMarker.apk
	LifeMarker/bin/classes.dex
	LifeMarker/bin/classes/com/draft/lifemarker/MyFragment$MyAdapter.class
	LifeMarker/bin/classes/com/draft/lifemarker/MyFragment$ViewHolder.class
	LifeMarker/bin/classes/com/draft/lifemarker/MyFragment$mListener.class
	LifeMarker/bin/classes/com/draft/lifemarker/MyFragment.class
	LifeMarker/bin/resources.ap_
	LifeMarker/res/layout/fragment_pager_list.xml
	LifeMarker/src/com/draft/lifemarker/MyFragment.java