merged from BRANCH_1_5: Jay Smith isn't active
Added .gitignore