[#1540] Faris : removed test in export_child_photo_wall.feature
MJ: merge changes
MJ:merge
Bruce - adding style for error message in advanced-search page
Merge remote-tracking branch 'origin/master'
Remo/MJ : Completed #1588 Reverting work on #1246
The save & discard buttons should be aligned to the right story#1590
Merge pull request #369 from rdsubhas/master

1572 | Subhas/Kavitha | Reindex records after replication is complete
Merge pull request #370 from akash/master

Faris/Akash = #1287 - fixed migration of ftr_status to take into account the fact it has already been added manually into prod server
Faris/Akash = #1287 - fixed migration of ftr_status to take into account the fact it has already been added manually into prod server
Merge branch 'master' of https://github.com/JamesMura/RapidFTR into pull-req-359
fixng test
Merge pull request #371 from akash/master

merging/fixing pull req 359
Merge pull request #363 from farismosman/master

[#1591 Code Jam] Defect fixed during the code jam (Bruce/Batman)
Merge branch 'master' of https://github.com/mistaguy/RapidFTR into pull-req-360

Conflicts:
	public/javascripts/translations.js
Merge branch 'pull-req-360'
Merge pull request #372 from akash/master

merging pull req 360
Subhas|Kavitha - Added session timeout
1572 | Subhas/Kavitha | Refactored capistrano scripts to support starting the scheduler as well