text-fading fx added
Merge branch 'master' of github.com:moklick/picsma

Conflicts:
	js/picsma.ui.js