rapidftr/tracker#41 @andreweskeclarke @mwangiann Changing sort options on Children index page to include all sortable fields
rapidftr/tracker#41 @andreweskeclarke @mwangiann Adding descending/ascending option to Children list sort
Merge branch 'master' of https://github.com/rapidftr/RapidFTR

Conflicts:
	Gemfile.lock
	app/controllers/children_controller.rb
rapidftr/tracker#41 @andreweskeclarke @mwangiann Styling the sorting options, restricting sort options to visible fields
Use lambda to call return from a migration
Prevent nested blocks in migration
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
rapidftr/tracker#41 @andreweskeclarke Including pry in test and development env's so we can have it loaded by spec helper
Merge pull request #668 from andreweskeclarke/master

Making all visible, searchable fields sortable
Update solr config to ASCII-fy multi lingual characters
Update sunspot rake tasks
Merge branch 'master' of github.com:rapidftr/RapidFTR
Update Docker to reflect latest Solr upgrades
Adds test coverage for rapidftr/tracker/#41
Update Docker to reflect latest Solr upgrades, persist volumes and create SSH keys
Minor Docker refactorings
Merge branch 'master' of github.com:rapidftr/RapidFTR
rapidftr/tracker#41 @andreweskeclarke @tomclement Fixing flaky cucumber test by using capybara's default click
Merge pull request #1 from andreweskeclarke/master

rapidftr/tracker#41 @andreweskeclarke @tomclement Fixing flaky cucumber ...
Docker: Enable HTTPS in CouchDB