xmp
xmp
xmp
omgwtf
omg
Merge branch 'master' of github.com:TEAMWORKGIT/creativecoffee

Conflicts:
	app/AdminModule/templates/@layout.latte
	app/FrontModule/templates/@layout.latte
	app/bootstrap.php
	composer.json