Upgrade elfinder
Fix actual locker configuration row generator
Merge branch 'master' of github.com:EESoc/eesoc-website

Conflicts:
	app/config/app.php
	app/routes.php
	composer.json
	composer.lock
Add comments
Add sales table, started work on EActivities integration
Add SalePresenter
Merge branch 'icusales' of github.com:EESoc/eesoc-website into icusales

Conflicts:
	app/commands/SyncEActivitiesSalesCommand.php
	app/database/migrations/2013_09_02_130534_create_sales_table.php
	app/libraries/EActivities/Client.php
	app/models/Sale.php