Filter fadeIn and fadeOut
Merge branch 'master' of https://github.com/podpo/ndi2013_kps_web

Conflicts:
	index.html