Modified Collaboration interface and administration list
added powerformwizard plugin
Changed gitignored and conflicts
changed gitignore
Merge branch 'collaboration' of https://github.com/poderopedia/plug_and_play into collaboration

Conflicts:
	.gitignore
	__init__.pyc
deleted __init__.pyc