Merge branch 'master' of https://github.com/gaurav13989/CI_BigData.git

Conflicts:
	application/controllers/machine.php
	application/models/restaurant_feature_list.php
Merge remote-tracking branch 'origin/master'