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
test modification
Jaya: Fixed a web step in add_custom_field_to_form_section.feature
Merge branch 'master' of https://github.com/LiKethoughtworks/RapidFTR into pull-req-502
Merge pull request #521 from akash/master

merging pull req 502
Merge pull request #517 from farismosman/master

[#1821] Adding functional tests
Merge branch 'master' of https://github.com/kjayamit/RapidFTR into pull-req-507

Conflicts:
	capybara_features/pdf_export.feature
	capybara_features/user_management.feature
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	capybara_features/step_definitions/login_steps.rb
Merge pull request #522 from akash/master

merging pull req 507
Akash - 1821 - not showing export link on ll children page when user doesn't have permissions
Akash - fixing add_custom_field feature
ci | Subhas | Add vendor/cache to gitignore
Faris : Fixed conflicts.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Akash - fixing merge screw ups with export functionality
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #523 from akash/master

fixed issues caused by (my) dodgy merges last night
Merge branch 'master' of git://github.com/rapidftr/RapidFTR