comit
Merge branch 'master' of https://github.com/NhamPhanDinh/smmatest
add content calendar and dialog filler calendar
Merge branch 'master' of https://github.com/NhamPhanDinh/smmatest

Conflicts:
	SMMA/res/layout/event_calendar.xml
Merge branch 'master' of https://github.com/NhamPhanDinh/smmatest

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