Add a VM api
Add rubymine configuration
Stash some VM code away
Merge branch 'master' into vm

Conflicts:
	Gemfile.lock
Show the logo if it's a VM event
Create events, update API, move some things around
Remove RubyMine stuff
Add requirements table
Readd proxy, add requirements
Make it vm-id instead of is_vm
Send the API calls when signing up for an event.  Do not allow addition of events which require filling out forms
Revert back to Seattle, to push to 'latest'
No proxy
Ability to add an org admin
Merge branch 'add_org_admin' into new_design
Update URL
Merge branch 'add_org_admin' into new_design
Merge in VM api
Move admin links to a new admin dropdown
Merge branch 'new_design' of https://github.com/agoln/FlashVolunteer into new_design

Conflicts:
	app/views/shared/_header.html.erb