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