Merge branch 'doc_indexing_2' into dev

Conflicts:
	.gitignore
	app/controllers/bills_controller.rb
Merge branch 'dev'