Merge branch 'master' of https://github.com/klemenzagar91/BeforeAfter into develop

Sync init files from origin
Merge branch 'develop' of https://github.com/klemenzagar91/BeforeAfter