Merge branch 'master' of github.com:novoda/merlin into develop
moving to gradle
moving to gradle
removing .gradle dir
merging with latest
adding gradle to readme
adding missing codeblock
merging
moving dependencies around
resolving directory mishmash
trying to re add tests
fixing test imports
recombining the robolectric tests into core
deleting old test runner
removing old robolectric gradle code, adding robolectric-plugin, merging develop
merging"
getting robolectric tests working with android-library, updated to latest robolectric
adding missing files, R.java is needed because this is a library
adding idea plugin to auto import robolectric dependencies
updating readme to prepare for making gradle the base!!