Added Laravel framework for future use
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.inc.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.inc.php