Merge github.com:expertiza/expertiza into rails4

Update from upstream