New flat-ui bootstrap
Starting html views
Merge branch 'master' of https://github.com/visd/VISD-Badges

* 'master' of https://github.com/visd/VISD-Badges:
  Added template, renamed existing
  Added view and sample context for /challenge/:id

Conflicts:
	badges/templates/base.html
Acidentally ignored
Fixed Merge
Flattedend the stucture a bit
Flattedend the stucture a bit
Added "events" and "provisioner" apps

See wiki. Also had to comment out a few lines in badges.models. Added
requirements.
Flattedend the stucture a bit
Merge branch 'master' of https://github.com/visd/VISD-Badges

* 'master' of https://github.com/visd/VISD-Badges:
  Added "events" and "provisioner" apps
  Flattedend the stucture a bit

Conflicts:
	badges/models.py
Added *.sql
New file stucture to match master branch
Merge branch 'master' into events

* master:
  Added *.sql
  Flattedend the stucture a bit
  Added "events" and "provisioner" apps
  Flattedend the stucture a bit
  Flattedend the stucture a bit
  Fixed Merge
  Acidentally ignored
  Starting html views
  New flat-ui bootstrap

Conflicts:
	badges/models.py
	events/context_processors.py
	events/models.py
	settings.py
This stupid file was nammed wrong

It took forever for me to catch it.