update bd + spaCMS
Merge branch 'master' of https://github.com/DVLGroup/Project_Wahanda_Alternative
faq 50% processing
Merge branch 'master' of https://github.com/DVLGroup/Project_Wahanda_Alternative

Conflicts:
	DataFile/dbwahanda(20).sql