Fixed Issue #12 and Issue #14
Merge branch 'Issue-12-14' of github.com:insignia4u/staffeye-fe into Issue-12-14