test akash
Merge branch 'master' of https://github.com/SHopMyLifi/shopmylifi

Conflicts:
	bin/classes/com/example/shopmylifi/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/shopmylifi/MainActivity.class
	bin/jarlist.cache
Merge branch 'master' of https://github.com/SHopMyLifi/shopmylifi
merge akash-