updated

inserted form
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/js/admin/sb-admin-2.js
Merge branch 'master' of https://github.com/ASRSoftware/Globalfuel