i
Merge branch 'master' of https://github.com/NhamPhanDinh/smmatest

Conflicts:
	SMMA/src/jp/ne/smma/EventList/EventListFragment.java