Added 505 page, changes in main page
Merge from remote
Merged again