Merge pull request #4 from papzkie/development

latest
bugfix header nav menu link for login page
Merge pull request #10 from jeffdagala/development

latest copy