Merge pull request #7 from CruGlobal/movement_tracker_status_filter

Movement report status filter
Merge branch 'reports_status' into dev

Conflicts:
	app/controllers/movement_reports_controller.rb
Merge pull request #9 from CruGlobal/movement_tracker_status_filter

header/footer column titles fix
Merge branch 'master' into dev
Merge pull request #15 from CruGlobal/report_table_headers

2 col header for better copy/paste to excel
Merge pull request #13 from CruGlobal/movement_status_auto_change

Movement status auto change
Merge branch 'master' into dev
Merge branch 'report_table_headers' into dev
add strategy filter
Merge pull request #22 from bholaday/patch-1

add strategy filter
Add strategies api endpoint
Update gems
Add strong attributes stuff for stat API
Update gems
Fix up ministry tracker report columns
Fix stats logic so that it auto-updates activity status based on stats that come in via API
Add GR stuff for infobase
Update CE
Merge branch 'master' of github.com:CruGlobal/infobase

Conflicts:
	Gemfile
	Gemfile.lock
Update CE