1546 | Add new button in photo management page to view full size photo
Merge pull request #385 from farismosman/master

[#1220] View history of user actions
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.