cascade classifier
Merge branch 'master' of https://github.com/dpacholczyk/pjatk-mgr.git

Conflicts:
	src/com/fixus/towerdefense/StarterActivity.java