Auto Awesome Merging
Merge branch 'rails4' of http://github.com/ravishroshan/expertiza into rails4