allow multiple databases
incorporated feedback
Merge branch 'master' of https://github.com/ErikGoldman/robolectric into ErikGoldman-master

Conflicts:
	src/main/java/org/robolectric/shadows/ShadowSQLiteOpenHelper.java