Revert some edit form layout code.

Conflicts:

	xadmin/views/edit.py
Fix typo "Cacnel" to "Cancel"
Catch and ignore value error, can happen with dashboard setting of
"4,5|". Also make qbutton usable by non-superusers by testing for
view permission on the model.
Merge pull request #44 from thaxter/typo-cancel

Fix typo "Cacnel" to "Cancel"
Merge pull request #45 from thaxter/qbutton-fix

Enable Quick Button Widget for non-super-users
Add Model base Dashboard view, u can extends your own model base dashboard view.

Conflicts:

	xadmin/views/dashboard.py
Merge branch 'master' of github.com:sshwsfc/django-xadmin
added icon to BaseActionView (defaults to remove like in the template)
added icon to template so that Actions can choose their icons
Update actions.py
Merge pull request #46 from A-T-X/master

Allow custom icons for BaseActionViews
Add Dashboard widget ``widget_customiz`` attr.

Conflicts:

	xadmin/views/dashboard.py
make xlwt real optional

you can install it by `pip install django-xadmin[Excel]`
Merge pull request #49 from flisky/xlwt-optional

make xlwt real optional
add a way to disable queryset.select_related in ListAdminView

it's unacceptable slow when sql inner joins multiple tables
also, only select_related the displaying fields to boost performance
Merge pull request #52 from flisky/select_related

add a way to disable queryset.select_related in ListAdminView
Merge branch 'refs/heads/master' into bp3

Conflicts:
	xadmin/locale/en/LC_MESSAGES/django.po
	xadmin/locale/zh_CN/LC_MESSAGES/django.po
	xadmin/templates/xadmin/views/model_delete_confirm.html
	xadmin/templates/xadmin/views/model_delete_selected_confirm.html
	xadmin/views/dashboard.py
	xadmin/views/edit.py