ignore directories containing code generated by build
Merge branch 'master' into develop