Updated .gitignore
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	Ticker/bin/Ticker.apk
	Ticker/bin/classes.dex
	Ticker/bin/resources.ap_