model finished
Merge branch 'stackpublish' into placeholder_plugin
Merge branch 'FinalAngel-feature/clipboard' into placeholder_plugin
migration added
copy fixes
fixed imports
Merge branch 'develop' into placeholder_plugin

Conflicts:
	cms/admin/placeholderadmin.py
	cms/templatetags/cms_tags.py
Merge branch 'develop' into placeholder_plugin
fixed merge error
removed unused line
PlaceholderRef should have a language
seams to break tests... no clue why
added tests
removed unused class
Merge pull request #2376 from digi604/placeholder_plugin

WIP Placeholder plugin