Finished Minder Config and staged android python for next revision
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore