Merge pull request #27 from scalableinternetservices/godgutten

Godgutten
fixed locations page, added error image etc