Prototype for embed content type
Merge branch 'master' of github.com:ArcheProject/Arche

Conflicts:
	arche/fanstatic_lib.py