Merge Development into Master

#1 (closed) Ready to merge our Ingress Controller into the master and attain approval