Added *.cache to .gitignore
Merged dev