Merge branch 'master' of https://github.com/radoslavmihalus/dogsportal.git