More changes to interface
Merge branch 'master' of https://github.com/alan-cy-lai/keyfile
Added folder image
Added changes to layouts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/master.blade.php