rename modeladmin to model_admin fixes #91
Merge remote-tracking branch 'upstream/master' into rename-modeladmin-model_admin

Conflicts:
	djadmin2/core.py
	djadmin2/templates/admin2/bootstrap/index.html
	djadmin2/views.py
Merge pull request #97 from RaphaelKimmig/rename-modeladmin-model_admin

rename modeladmin to model_admin fixes #91