Added smarty compiled views to .gitignore
Merge commit 'origin/master'