merge
Merge branch 'master' of git@github.com:flashbac/esd_projekt.git

Conflicts:
	andriod/gen/bht/ti/facefinder/R.java