Updated .gitignore to not ignore some resources.
Merged parallel changes.