pagination, invoice templates list
Merge branch 'redmine2' of github.com:descala/haltr into redmine2
Merge branch 'redmine2' of github.com:descala/haltr into redmine2
Merge branch 'redmine2' of github.com:descala/haltr into redmine2
Merge branch 'redmine2' of github.com:descala/haltr into redmine2

Conflicts:
	app/controllers/received_controller.rb
	app/views/invoice_templates/index.html.erb