Merge branch 'rails4' of https://github.com/expertiza/expertiza into rails4
tests added
test changes