no message
no message
Merge commit '57666ae6a6c36d84ab1fd260ef7411d8df9f4d90'

Conflicts:
	application/controllers/similarity_controller.php
Merge branch 'master' of https://github.com/gaurav13989/CI_BigData