WIP - migrating machines
Merge branch 'master' of github.com:rapidftr/RapidFTR

Conflicts:
	app/models/child.rb
	spec/models/child_spec.rb
Merge branch 'master' of github.com:rapidftr/RapidFTR
Merge branch 'master' of github.com:rapidftr/RapidFTR

Conflicts:
	app/models/child.rb
tests for solr multilingual search
destroying solr's state after each test
rapidftr/tracker#137 @mwangiann @austiine04 bug fix - error when saving formsections with fields that have similar display names
rapidftr/tracker#137 cleaned unique_name validations
Merge pull request #674 from austiine04/master

Fixed bug in display_name validations
rapidftr/tracker#99 Cucumber tuning
Add test to cover rapidftr/tracker#137
Merge pull request #675 from tomclement/master

Add test to cover rapidftr/tracker#137
Update infrastructure
Merge pull request #676 from rdsubhas/master

rapidftr/tracker#99 Cucumber tuning
rapidftr/tracker#55 @ctumwebaze @andreweskeclarke Creating Form index page
rapidftr/tracker#55 @ctumwebaze @andreweskeclarke Adding links on forms page to form sections page
rapidftr/tracker#55 @ctumwebaze @andreweskeclarke changes seeding to associate form sections to forms.
rapidftr/tracker#55 @ctumwebaze @andreweskeclarke Addin forms, form pages, and making children form seeded correctly.  Fixing the many tests broken by this change.
rapidftr/tracker#55 @ctumwebaze @andreweskeclarke Making Enquiries Form load by default in the seeded data