setting up bower, gulp
further gulp implimentation
adding in charge upload form
first draft of charge upload functional
Merge branch 'feature/ChargeUploadForm'

Conflicts:
	app/routes.php
fixed problem with merge
removed test charge
fixed routes
removed charges
restrict permissions to create charge
fixed permission check
fixed typos on resolutions page
Merge branch 'master' of github.com:sotacoa/website into develop

Conflicts:
	app/views/pages/generator.blade.php