Updated Divi to version 2.1.4 and merged with our current changes to parent theme