Merge pull request #1 from relotnek/development

Merge development into Master
Merge branch 'master' into herokupostgres