Fixed little bug
Merge branch 'dev'

Conflicts:
	static/js/fotki.coffee