dialog
Merge branch 'master' of https://github.com/gabaruga/SMSParser.git

Conflicts:
	src/com/pino/smsparser/MainActivity.java