Fix the bug with Page Count and filter journal
Merge branch 'develop'

Conflicts:
	app/controllers/admin/company_profiles_controller.rb
	app/controllers/admin/journals_controller.rb
	app/helpers/admin/journals_helper.rb
	app/models/admin/journal_issue.rb
	app/views/admin/journal_issues/_index_body.html.erb
	app/views/admin/journal_issues/_index_head.html.erb
	app/views/admin/journal_issues/_list_data_project.html.erb
	app/views/admin/journal_issues/show.html.erb
	app/views/admin/journals/_index.html.erb
	app/views/admin/journals/index.html.erb
	app/views/admin/shared/_sidebar_status_journal.html.erb
Merge branch 'master' of https://github.com/HasanAlFarisi/my_journal