marvins commit
new GUI
Merge branch 'master' into flickr

Conflicts:
	index.php