Added Resources/android dir to gitignore
Merge branch 'master' into dev