preMerge wiki
preMere wiki2
Merge branch 'master' of https://github.com/Juan-redatlas/SAT

Conflicts:
	static/suit-ckeditor/ckeditor/config.js
	wiki/models.py
Finalizado Merge dev_wiki