add media support
Merge branch 'master' of https://github.com/ifree/geeknote

Conflicts:
	geeknote/gnsync.py