Add more ignore file patterns.
Add more ignore file patterns and add new prod folder.
Add line to resolve conflicts.
Merged master with prod_1.0.1 branch