Added Feature: Discard Old Builds
fixing merge conflicts
Merge branch 'brgaulin-master'