thumbnails addition
prefs file
Merge branch 'master' of git@github.com:raalveco/frases.git

Conflicts:
	application/controllers/backgrounds.php