The config changes
Resovling conflicts
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Merge branch 'master' of https://github.com/binnyva/madapp
Pre Conf Config Correction
Revert "Review Parameters and Milestones now functional"

This reverts commit 1a821fec565e2480058378e9f82e325c125391ad.