meta.
meta.
Merge branch 'master' of github.com:nvv/Far-On-Droid

Conflicts:
	farondroid.iml