1546 | Add new button in photo management page to view full size photo
Merge branch 'master' of https://github.com/obxhdx/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	app/views/child_media/manage_photos.html.erb
Merge pull request #399 from akash/master

merging pull req 397 - Fix #1546 Cannot Download Pictures
[#translation] Faris : translation in manage_photo.
Merge pull request #400 from farismosman/master

[#translation] in manage_photo
1597|Deepak| Text change for 'Manage System Users'
Merge pull request #401 from paramadeep/master

1597
Merge pull request #398 from rdsubhas/replication_fix

1619 | Subhas | Change localhost to app URL
ci | Subhas | Do not run scheduler if on release1