MJ: merge changes
MJ:merge
Remo/MJ : Completed #1588 Reverting work on #1246
The save & discard buttons should be aligned to the right story#1590
Faris/Akash - ignoring reports dir
Merge pull request #364 from akash/master

Faris/Akash - removed (and ignored) reports in reports dir
Merge pull request #365 from akash/master

Faris/Akash - #1287 - added test for report generation
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Faris/Akash - #1287 - added test for report generation
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #366 from akash/master

merge
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #367 from akash/master

Faris/Akash = #1575 - creating reports dir if doesn't already exist and ignoring from git
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Faris/Akash = #1575 - creating reports dir if doesn't already exist and ignoring from git
Faris/Akash = #1575 - fixing report schedule
Merge pull request #368 from akash/master

oops - fixing report schedule
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
1572 | Subhas/Kavitha | Move Rufus Scheduler into a separate daemon
1572 | Subhas/Kavitha | Create controller action for reindexing child records