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