04:21
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/logs/log-2014-11-21.php
	application/views/vevaluate.php
Merge branch 'master' of https://github.com/hsazzad/Elog