Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
reverting disable photo wall functionality
reverted the functionality of disable photo wall
ignored translations.js file
reverted the translations.js git ignored stuff
merged
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[1613] Fixed Verify text.
[1613] Faris : Fixed the view in roles.
[1613] Faris : fixed the child view pages.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
[#1220] Akash/Faris : load all children editted by a specific user.
merging