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
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
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
Faris/Akash - #1220 - can return all children that a user has created or edited for changelog
[#1220] Akash/Faris : renamed history controller to child_history_controller.
[#1220] Akash/Faris : added user_history controller -- work in progress.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR