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
Convert Windows line ending to Unix line endings
Merge pull request #672 from sferik/dos2unix

Convert Windows line ending to Unix line endings
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
Update Vagrant box to Ubuntu 14.04
Updated infrastructure [skip ci]
Updated vagrant to use 14.04 [skip ci]