Update forms.py
Update forms.py
Merge HEAD, branch 'master' of https://github.com/relic7/djdam
Merge remote-tracking branch 'origin/bootstrap3update'

Conflicts:
	djdam/apps/searcher/forms.py
Merge branch 'bootstrap3update' of https://github.com/relic7/djdam

Conflicts:
	djdam/apps/searcher/forms.py
Merge remote-tracking branch 'origin/bootstrap3update'

* origin/bootstrap3update: (302 commits)
  xx
  ccc
  c
  c
  added uploader heirarchy
  moved static all around??yikes
  c
  index search upload?
  added uploader heirarchy
  fixins
  c
  added ajaxuploader and uploader to apps and crispy forms templ pack bs3
  added uploader heirarchy
  added uploader heirarchy
  djdam.settings.base lots of changes
  djdam.settings.base lots of changes
  djdam.settings.base lots of changes
  djdam.settings.base lots of changes
  djdam.settings.base lots of changes
  djdam.settings.base lots of changes
  ...
Merge branch 'master', remote-tracking branch 'remotes/origin/master' into bootstrap3update