Added asdf.txt file
Added master asdf file
Merge branch 'android-spike'
Added vs settings
RJA #2213 Added timout to config
RJA #2456 Added db config to project