Merge branch to master

The branch specific Laravel components were tested and they are good enough for the project's needs.