backbone: paging by backbone.paginator is done
backbone: back button is updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/routes