SmoothAnimLayoutLibs
Merge branch 'master' of https://github.com/kvitajakub/marathonOctober2014

Conflicts:
	haarcascade_frontalface_default.xml
	marathonOctober2014/demo_video.java