fix the views
Merge branch 'master' of https://github.com/nktx/PluzBook_web into nktx-master

Conflicts:
	application/views/login.php
Merge branch 'nktx-master'
Add hover edit icons