fix bug #1809 should not be able to delete photo of child registered with only the photo by  Li Ke
update delete photos  method and test.
Jaya: Removed 2 repetative steps in web_steps.rb
1606 | Subhas | Fix order of resetting database during windows installer
S#1676|Garima/Mark|Divided permission for child export in abilities

This commit contains:-
* Changing of permission All Children page
* Changing of permission on Single Child page
* A database migration to migrate existing data to new permissions
Added some more test scenarios
test modification
Jaya: Fixed a web step in add_custom_field_to_form_section.feature
Merge feature files related to upload file.
bug 1822
modification of the Merging feature files related to Upload File in the automation suite.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1821] Akash/Faris : Added csv export feature test for a single record.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1821] Akash/Faris : Added csv export feature test for multiple records.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
1619 | Subhas | Sync MobileDbKey and Device during replication
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of https://github.com/singhgarima/RapidFTR into pull-req-495

Conflicts:
	app/controllers/advanced_search_controller.rb
	app/controllers/children_controller.rb
	app/views/children/_header.html.erb
	app/views/children/_search_results.html.erb
	app/views/children/_show_child_toolbar.erb
	capybara_features/csv_export.feature
	spec/controllers/advanced_search_controller_spec.rb
	spec/controllers/children_controller_spec.rb
	spec/views/child/_header.html.erb_spec.rb
	spec/views/child/show.html.erb_spec.rb
1790 | Subhas/Viky | Optimize migrations for all children