Fixed Issue #58
Merge branch 'master' of github.com:insignia4u/staffeye-fe into issue-58

Conflicts:
	source/layouts/layout.slim
	source/layouts/layout_user.slim
Fixed minor bugs in previous commit.
Fixed minor bugs in previous commit.
Merge branch 'issue-58' of github.com:insignia4u/staffeye-fe into issue-58
Merge branch 'master' of github.com:insignia4u/staffeye-fe into issue-58

Conflicts:
	.gitignore
Merge branch 'master' of github.com:insignia4u/staffeye-fe into issue-58

Conflicts:
	.gitignore
Merge branch 'issue-58' of github.com:insignia4u/staffeye-fe into issue-58
Merge pull request #63 from insignia4u/issue-58

Issue 58