UPDATED FILES
Merge branch 'master' of https://github.com/fedarko/SMSPidemic.git

Conflicts:
	src/com/mfedarko/smspidemic/MainActivity.java