hgg
Merge branch 'master' of https://github.com/nilsberglund/TIAL

Conflicts:
	TIAL/bin/TIAL.apk
	TIAL/bin/resources.ap_