Fix layout 4/3/2014
Merge branch 'master' of https://github.com/NhamPhanDinh/smmatest

Conflicts:
	SMMA/res/layout/event_calendar.xml