Ignore Mac OSX .DS_Store files
Add skeleton Maven android project
Further updates to basic settings
Merge branch 'master' into integration