Merge branch 'compilacao' of github.com:interlegis/sapl into compilacao

Conflicts:
	compilacao/models.py

compilacao/forms.py

@@ -0,0 +1,4 @@
+from django import forms
+
+
+# place form definition here

compilacao/models.py

@@ -1,4 +1,5 @@
-from django.db import models
+from django.db import models 
+
 from django.utils.translation import ugettext_lazy as _
 
 

compilacao/urls.py

@@ -0,0 +1,6 @@
+try:
+    from django.conf.urls import *
+except ImportError:  # django < 1.4
+    from django.conf.urls.defaults import *
+
+# place app url patterns here