Conflict resolved

Conflict resolved
Merge remote-tracking branch 'origin/10.2_design_changes_forms'
search user details issue fixing

search user details issue fixing
update history while insert

update history while insert
User Management - Search user bug fixing

User Management - Search user bug fixing
Order by changes user model

user model changes
Search user page conflict
Merge branch 'master' of https://github.com/subodh4codaemon/redlemon

Conflicts:
	application/logs/log-2014-05-26.php
Merge remote-tracking branch 'origin/master' into 10.2_design_changes_forms