Added support for optional git-ignored facebook-dev.properties and jdbc-dev.properties files
Updated git ignore
Merge branch 'v1' into v2
Merge branch 'v2' into v3