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

Sync init files from server on master branch.
Merge branch 'develop' of https://github.com/klemenzagar91/BeforeAfter into develop