minor
Merge branch 'master' of github.com:a17r/a17rgentoo

Conflicts:
	app-pda/flashtool/Manifest