Added *.vrb to gitignore
Merge master into dev