added custom 404 page, fixed some bugs
Merge branch 'develop'