Manual merge of ungleich/master into opennebula-integration

datacenterlight/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from .models import BetaAccess
+from .models import BetaAccess, BetaAccessVM
 
 
 class BetaAccessForm(forms.ModelForm):
@@ -9,3 +9,11 @@ class BetaAccessForm(forms.ModelForm):
     class Meta:
         fields = ['email']
         model = BetaAccess
+
+
+# class BetaAccessVMForm(forms.ModelForm):
+#     type = forms.CharField(widget=forms.EmailInput())
+
+#     class Meta:
+#         fields = ['email']
+#         model = BetaAccessVM