Fix migration problem
Fix typo in install instructions
Update form_designer/locale/fr/LC_MESSAGES/django.po

Fix typo
Add support for Django 1.5 custom User models
Fixed spacing issues
Adding locale for brazilian portuguese
Merge pull request #57 from huxley/develop

Add support for Django 1.5 Custom User models
Update AUTHORS
Merge pull request #44 from keysen/master

Problem when migrating
Merge pull request #58 from ruhan/portuguese-locale

Adding locale for brazilian portuguese
Merge pull request #52 from driesdesmet/installinstructions_fix

Fix typo in install instructions
Merge pull request #53 from DeeJayPee/patch-1

Update form_designer/locale/fr/LC_MESSAGES/django.po
Update AUTHORS
Update AUTHORS
Merge remote-tracking branch 'upstream/master'

Conflicts:
	form_designer/models.py