pull-to-refresh
Merge remote-tracking branch 'origin/f7' into f7

Conflicts:
	js/templates/lists.html
pull-to-refresh