Merge remote-tracking branch 'upstream/master'
rename modeladmin to model_admin fixes #91
Fixing issue that permissions cannot be hyperlinked from users and group API resource.
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 remote-tracking branch 'upstream/master'
Adding smoke tests for User and Group API resources.
Merge pull request #102 from gregmuellegger/rest-api

Rest api fixes
Merge pull request #97 from RaphaelKimmig/rename-modeladmin-model_admin

rename modeladmin to model_admin fixes #91
Edit form improvement - part of #72
warnings in models
Merge pull request #104 from audreyr/edit-form-enhancements-72

Edit form improvement - part of #72
Prep for version 0.2.0
Replaced change password and logout links with dropdown
Fixed bug with modellist if more than one item
Merge pull request #107 from ludw/master

Fixed small issue in modellistview
Merge pull request #108 from ludw/headerui

Header UI style
Change README so people get an idea as to what we want
Adding warnings about refactoring
architecture thoughts
Add design to contributing